BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

mariadb: fix non-Darwin builds after 86dae701

Browse source 
I took care to get the same derivation as before that commit on Linux
and not to change derivation on Darwin.
This commit is contained in:
Vladimír Čunát 2015-10-30 09:29:02 +01:00
parent abbe5f27a9
commit 4e1fdadd02
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
pkgs/servers/sql/mariadb/default.nix
View file

@ -93,12 +93,15 @@ stdenv.mkDerivation rec {
mv $out/lib $lib mv $out/lib $lib
mv $out/include $lib mv $out/include $lib
''
+ stdenv.lib.optionalString stdenv.isDarwin ''
# Fix library rpaths # Fix library rpaths
# TODO: put this in the stdenv to prepare for wide usage of multi-output derivations # TODO: put this in the stdenv to prepare for wide usage of multi-output derivations
for file in $(grep -rl $out/lib $lib); do for file in $(grep -rl $out/lib $lib); do
install_name_tool -delete_rpath $out/lib -add_rpath $lib $file install_name_tool -delete_rpath $out/lib -add_rpath $lib $file
done done
'' + ''
# Fix the mysql_config # Fix the mysql_config
sed -i $out/bin/mysql_config \ sed -i $out/bin/mysql_config \
-e 's,-lz,-L${zlib}/lib -lz,g' \ -e 's,-lz,-L${zlib}/lib -lz,g' \