From 4e1fdadd022ed9a1f7517b60b704c48bc30aaa75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 30 Oct 2015 09:29:02 +0100 Subject: [PATCH] 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. --- pkgs/servers/sql/mariadb/default.nix | 3 +++ 1 file changed, 3 insertions(+) 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' \