From af50c2cb27d9c15451aab2204dd4bc936be5e986 Mon Sep 17 00:00:00 2001 From: Cody P Schafer Date: Mon, 3 Oct 2022 20:41:33 -0400 Subject: [PATCH] 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 --- pkgs/tools/filesystems/f3/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/filesystems/f3/default.nix b/pkgs/tools/filesystems/f3/default.nix index b9817ecb05c0..e11fad78d9f1 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;