b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

treewide: fixDarwinDylibNames only on Darwin

Browse source
This commit is contained in:
OPNA2608 2022-03-22 19:47:59 +01:00
parent 835b162cae
commit b07c5b829a
3 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/development/libraries/libargon2/default.nix
View file

@ -11,7 +11,9 @@ stdenv.mkDerivation rec {
sha256 = "0p4ry9dn0mi9js0byijxdyiwx74p1nr8zj7wjpd1fjgqva4sk23i"; sha256 = "0p4ry9dn0mi9js0byijxdyiwx74p1nr8zj7wjpd1fjgqva4sk23i";
}; };
nativeBuildInputs = [ fixDarwinDylibNames ]; nativeBuildInputs = lib.optionals stdenv.isDarwin [
fixDarwinDylibNames
];
patches = [ patches = [
# TODO: remove when https://github.com/P-H-C/phc-winner-argon2/pull/277 is merged + released # TODO: remove when https://github.com/P-H-C/phc-winner-argon2/pull/277 is merged + released

3
pkgs/development/libraries/talloc/default.nix
View file

@ -21,11 +21,12 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ nativeBuildInputs = [
pkg-config pkg-config
fixDarwinDylibNames
python3 python3
wafHook wafHook
docbook-xsl-nons docbook-xsl-nons
docbook_xml_dtd_42 docbook_xml_dtd_42
] ++ lib.optionals stdenv.isDarwin [
fixDarwinDylibNames
]; ];
buildInputs = [ buildInputs = [

2
pkgs/development/lua-modules/overrides.nix
View file

@ -301,7 +301,7 @@ with prev;
sed -i 's,${"\${.*INSTALL_INC_DIR}"},${placeholder "out"}/include/luv,' CMakeLists.txt 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. # Fixup linking libluv.dylib, for some reason it's not linked against lua correctly.
NIX_LDFLAGS = pkgs.lib.optionalString pkgs.stdenv.isDarwin NIX_LDFLAGS = pkgs.lib.optionalString pkgs.stdenv.isDarwin