diff options
| author | OPNA2608 <christoph.neidahl@gmail.com> | 2022-03-22 19:47:59 +0100 |
|---|---|---|
| committer | OPNA2608 <christoph.neidahl@gmail.com> | 2022-03-23 21:37:39 +0100 |
| commit | b07c5b829aa1f44cc314b13fd7d9072560cba605 (patch) | |
| tree | 0f228236786c3b7c4b4234b636c9eed51351c764 | |
| parent | 835b162caee2713d19e28117f6f292a6f03185d5 (diff) | |
| download | nixpkgs-b07c5b829aa1f44cc314b13fd7d9072560cba605.tar nixpkgs-b07c5b829aa1f44cc314b13fd7d9072560cba605.tar.gz nixpkgs-b07c5b829aa1f44cc314b13fd7d9072560cba605.tar.bz2 nixpkgs-b07c5b829aa1f44cc314b13fd7d9072560cba605.tar.lz nixpkgs-b07c5b829aa1f44cc314b13fd7d9072560cba605.tar.xz nixpkgs-b07c5b829aa1f44cc314b13fd7d9072560cba605.tar.zst nixpkgs-b07c5b829aa1f44cc314b13fd7d9072560cba605.zip | |
treewide: fixDarwinDylibNames only on Darwin
| -rw-r--r-- | pkgs/development/libraries/libargon2/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/libraries/talloc/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/development/lua-modules/overrides.nix | 2 |
3 files changed, 6 insertions, 3 deletions
diff --git a/pkgs/development/libraries/libargon2/default.nix b/pkgs/development/libraries/libargon2/default.nix index 2003c8957ff..eb8e6333d41 100644 --- a/pkgs/development/libraries/libargon2/default.nix +++ b/pkgs/development/libraries/libargon2/default.nix @@ -11,7 +11,9 @@ stdenv.mkDerivation rec { sha256 = "0p4ry9dn0mi9js0byijxdyiwx74p1nr8zj7wjpd1fjgqva4sk23i"; }; - nativeBuildInputs = [ fixDarwinDylibNames ]; + nativeBuildInputs = lib.optionals stdenv.isDarwin [ + fixDarwinDylibNames + ]; patches = [ # TODO: remove when https://github.com/P-H-C/phc-winner-argon2/pull/277 is merged + released diff --git a/pkgs/development/libraries/talloc/default.nix b/pkgs/development/libraries/talloc/default.nix index 07d830f00ce..cb7af61a63e 100644 --- a/pkgs/development/libraries/talloc/default.nix +++ b/pkgs/development/libraries/talloc/default.nix @@ -21,11 +21,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config - fixDarwinDylibNames python3 wafHook docbook-xsl-nons docbook_xml_dtd_42 + ] ++ lib.optionals stdenv.isDarwin [ + fixDarwinDylibNames ]; buildInputs = [ diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index 9190f1fff86..4db4200f7e2 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -301,7 +301,7 @@ with prev; sed -i 's,${"\${.*INSTALL_INC_DIR}"},${placeholder "out"}/include/luv,' CMakeLists.txt ''; - nativeBuildInputs = [ pkgs.fixDarwinDylibNames ]; + nativeBuildInputs = pkgs.lib.optionals pkgs.stdenv.isDarwin [ pkgs.fixDarwinDylibNames ]; # Fixup linking libluv.dylib, for some reason it's not linked against lua correctly. NIX_LDFLAGS = pkgs.lib.optionalString pkgs.stdenv.isDarwin |