From f5b1bd166aac6c8d3a2e85eaa8dffa3f3504dce0 Mon Sep 17 00:00:00 2001 From: roblabla Date: Fri, 15 Apr 2022 17:26:21 +0200 Subject: [PATCH] wimlib: Fix build on darwin. Wimlib works just fine on darwin, but two adjustments need to be made: - Tests need to be disabled, as they rely on glibc-isms (such as lgetattr). - cdrkit and syslinux dependencies are dropped, as those binaries are linux-only. --- pkgs/tools/archivers/wimlib/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/archivers/wimlib/default.nix b/pkgs/tools/archivers/wimlib/default.nix index bb8c6b8952fd..79840f9588ad 100644 --- a/pkgs/tools/archivers/wimlib/default.nix +++ b/pkgs/tools/archivers/wimlib/default.nix @@ -19,20 +19,20 @@ stdenv.mkDerivation rec { sha256 = "sha256-MvzJ6bFEt8sdtMhuEEyngoPNwiXhP+grJzZgWGrv4yM="; }; - preBuild = '' + preBuild = lib.optionalString (!stdenv.isDarwin) '' substituteInPlace programs/mkwinpeimg.in \ --replace '/usr/lib/syslinux' "${syslinux}/share/syslinux" ''; postInstall = let - path = lib.makeBinPath [ cabextract cdrkit mtools ntfs3g syslinux ]; + path = lib.makeBinPath ([ cabextract mtools ntfs3g ] ++ lib.optionals (!stdenv.isDarwin) [ cdrkit syslinux ]); in '' for prog in $out/bin/*; do wrapProgram $prog --prefix PATH : ${path} done ''; - doCheck = true; + doCheck = (!stdenv.isDarwin); preCheck = '' patchShebangs tests