summary refs log tree commit diff
diff options
context:
space:
mode:
authorCody P Schafer <dev@codyps.com>2022-10-03 20:41:33 -0400
committerCody P Schafer <dev@codyps.com>2022-10-16 20:07:31 -0400
commitaf50c2cb27d9c15451aab2204dd4bc936be5e986 (patch)
treede0d13630412ae6e63db61b530b80c507524b485
parent946774a4d14af09fa8a5358dcb5f033cc311064b (diff)
downloadnixpkgs-af50c2cb27d9c15451aab2204dd4bc936be5e986.tar
nixpkgs-af50c2cb27d9c15451aab2204dd4bc936be5e986.tar.gz
nixpkgs-af50c2cb27d9c15451aab2204dd4bc936be5e986.tar.bz2
nixpkgs-af50c2cb27d9c15451aab2204dd4bc936be5e986.tar.lz
nixpkgs-af50c2cb27d9c15451aab2204dd4bc936be5e986.tar.xz
nixpkgs-af50c2cb27d9c15451aab2204dd4bc936be5e986.tar.zst
nixpkgs-af50c2cb27d9c15451aab2204dd4bc936be5e986.zip
f3: fix build on darwin
 - parted is broken on darwin, but is not needed for the executables
   built on darwin anyway (f3read/f3write), so we can move it to the
   linux dep
 - argp.h is needed, include argp-standalone for it
-rw-r--r--pkgs/tools/filesystems/f3/default.nix8
1 files changed, 3 insertions, 5 deletions
diff --git a/pkgs/tools/filesystems/f3/default.nix b/pkgs/tools/filesystems/f3/default.nix
index b9817ecb05c..e11fad78d9f 100644
--- a/pkgs/tools/filesystems/f3/default.nix
+++ b/pkgs/tools/filesystems/f3/default.nix
@@ -1,5 +1,5 @@
 { stdenv, lib, fetchFromGitHub
-, parted, systemd ? null
+, parted, systemd, argp-standalone
 }:
 
 stdenv.mkDerivation rec {
@@ -22,10 +22,8 @@ stdenv.mkDerivation rec {
      done
   '';
 
-  buildInputs = [
-    parted
-  ]
-  ++ lib.optional stdenv.isLinux systemd;
+  buildInputs = lib.optional stdenv.isLinux [ systemd parted ]
+  ++ lib.optional stdenv.isDarwin [ argp-standalone ];
 
   enableParallelBuilding = true;