colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

squashfs-tools-ng: unbreak on x86_64-darwin

Browse Source
This commit is contained in:
Weijia Wang 2022-12-23 17:43:29 +01:00 committed by Rick van Schijndel
parent 7ddfb722dc
commit 0c7efbb01a
2 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/tools/filesystems/squashfs-tools-ng/default.nix
View File

@ -21,17 +21,5 @@ stdenv.mkDerivation rec {
license = licenses.gpl3Plus;
maintainers = with maintainers; [ qyliss ];
platforms = platforms.unix;
# TODO: Remove once nixpkgs uses newer SDKs that supports '*at' functions.
# Probably macOS SDK 10.13 or later. Check the current version in
# ../../../../os-specific/darwin/apple-sdk/default.nix
#
# From the build logs:
#
# > Undefined symbols for architecture x86_64:
# > "_utimensat", referenced from:
# > _set_attribs in rdsquashfs-restore_fstree.o
# > ld: symbol(s) not found for architecture x86_64
broken = stdenv.isDarwin && stdenv.isx86_64;
};
}

2
pkgs/top-level/all-packages.nix
View File

@ -11889,7 +11889,7 @@ with pkgs;
squashfsTools = callPackage ../tools/filesystems/squashfs { };
squashfs-tools-ng = callPackage ../tools/filesystems/squashfs-tools-ng { };
squashfs-tools-ng = darwin.apple_sdk_11_0.callPackage ../tools/filesystems/squashfs-tools-ng { };
squashfuse = callPackage ../tools/filesystems/squashfuse { };