Commit 0c7efbb0 authored by Weijia Wang's avatar Weijia Wang Committed by Rick van Schijndel
Browse files

squashfs-tools-ng: unbreak on x86_64-darwin

parent 7ddfb722

pkgs/tools/filesystems/squashfs-tools-ng/default.nix

+0 −12
Original line number Diff line number Diff line
@@ -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;

  };

}

pkgs/top-level/all-packages.nix

+1 −1
Original line number Diff line number Diff line
@@ -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 { };