treewide: fixDarwinDylibNames only on Darwin

main
OPNA2608 2 years ago
parent 835b162cae
commit b07c5b829a
  1. 4
      pkgs/development/libraries/libargon2/default.nix
  2. 3
      pkgs/development/libraries/talloc/default.nix
  3. 2
      pkgs/development/lua-modules/overrides.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

@ -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 = [

@ -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

Loading…
Cancel
Save