public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot]
2021-01-18 01:16:03 +00:00
committed by GitHub
parent 4bdb892722 3fc28a93b0
commit b7f20dcd02
270 changed files with 1545 additions and 952 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/ruby-modules/gem-config/default.nix
+3 -3
View File
@@ -265,7 +265,7 @@ in
hitimes = attrs: {
buildInputs =
stdenv.lib.optionals stdenv.isDarwin
lib.optionals stdenv.isDarwin
[ darwin.apple_sdk.frameworks.CoreServices ];
};
@@ -515,7 +515,7 @@ in
--replace "gobject-2.0" "${glib.out}/lib/libgobject-2.0${stdenv.hostPlatform.extensions.sharedLibrary}"
substituteInPlace lib/vips.rb \
--replace "vips_libname = 'vips'" "vips_libname = '${stdenv.lib.getLib vips}/lib/libvips${stdenv.hostPlatform.extensions.sharedLibrary}'"
--replace "vips_libname = 'vips'" "vips_libname = '${lib.getLib vips}/lib/libvips${stdenv.hostPlatform.extensions.sharedLibrary}'"
'';
};
@@ -632,7 +632,7 @@ in
};
zookeeper = attrs: {
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ darwin.cctools ];
buildInputs = lib.optionals stdenv.isDarwin [ darwin.cctools ];
dontBuild = false;
postPatch = ''
sed -i ext/extconf.rb -e "4a \