Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

Merge pull request #245135 from amarshall/pax-utils-non-linux

authored by Artturi and committed by GitHub d5597ff0 1d077436

+6 -2
+6 -2
pkgs/os-specific/linux/pax-utils/default.nix
··· 4 , buildPackages 5 , docbook_xml_dtd_44 6 , docbook_xsl 7 - , libcap 8 , pkg-config 9 , meson 10 , ninja ··· 25 26 strictDeps = true; 27 28 depsBuildBuild = [ buildPackages.stdenv.cc ]; 29 nativeBuildInputs = [ docbook_xml_dtd_44 docbook_xsl meson ninja pkg-config xmlto ]; 30 - buildInputs = [ libcap ]; 31 # Needed for lddtree 32 propagatedBuildInputs = [ (python3.withPackages (p: with p; [ pyelftools ])) ]; 33
··· 4 , buildPackages 5 , docbook_xml_dtd_44 6 , docbook_xsl 7 + , withLibcap ? stdenv.isLinux, libcap 8 , pkg-config 9 , meson 10 , ninja ··· 25 26 strictDeps = true; 27 28 + mesonFlags = [ 29 + (lib.mesonEnable "use_libcap" withLibcap) 30 + ]; 31 + 32 depsBuildBuild = [ buildPackages.stdenv.cc ]; 33 nativeBuildInputs = [ docbook_xml_dtd_44 docbook_xsl meson ninja pkg-config xmlto ]; 34 + buildInputs = lib.optionals withLibcap [ libcap ]; 35 # Needed for lddtree 36 propagatedBuildInputs = [ (python3.withPackages (p: with p; [ pyelftools ])) ]; 37