diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2015-10-30 09:29:02 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2015-10-30 09:29:02 +0100 |
| commit | 4e1fdadd022ed9a1f7517b60b704c48bc30aaa75 (patch) | |
| tree | d52b4bce9ae9b7bed69f8b1b5eb65c902ef66cf2 /pkgs/servers/sql | |
| parent | abbe5f27a992a938baf15471868854fb11f58b54 (diff) | |
| download | nixlib-4e1fdadd022ed9a1f7517b60b704c48bc30aaa75.tar nixlib-4e1fdadd022ed9a1f7517b60b704c48bc30aaa75.tar.gz nixlib-4e1fdadd022ed9a1f7517b60b704c48bc30aaa75.tar.bz2 nixlib-4e1fdadd022ed9a1f7517b60b704c48bc30aaa75.tar.lz nixlib-4e1fdadd022ed9a1f7517b60b704c48bc30aaa75.tar.xz nixlib-4e1fdadd022ed9a1f7517b60b704c48bc30aaa75.tar.zst nixlib-4e1fdadd022ed9a1f7517b60b704c48bc30aaa75.zip | |
mariadb: fix non-Darwin builds after 86dae701
I took care to get the same derivation as before that commit on Linux and not to change derivation on Darwin.
Diffstat (limited to 'pkgs/servers/sql')
| -rw-r--r-- | pkgs/servers/sql/mariadb/default.nix | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 0d39659d37fd..a6db4c469798 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -93,12 +93,15 @@ stdenv.mkDerivation rec { mv $out/lib $lib mv $out/include $lib + '' + + stdenv.lib.optionalString stdenv.isDarwin '' # Fix library rpaths # TODO: put this in the stdenv to prepare for wide usage of multi-output derivations for file in $(grep -rl $out/lib $lib); do install_name_tool -delete_rpath $out/lib -add_rpath $lib $file done + '' + '' # Fix the mysql_config sed -i $out/bin/mysql_config \ -e 's,-lz,-L${zlib}/lib -lz,g' \ |