diff options
| author | Dan Peebles <pumpkin@me.com> | 2016-04-17 14:48:08 -0400 |
|---|---|---|
| committer | Dan Peebles <pumpkin@me.com> | 2016-04-17 14:49:25 -0400 |
| commit | 5ced92f83bb260c59d58daec8e871d8a349b4467 (patch) | |
| tree | 62d7e2f30b1e9334ae15a073df9367ef4fd12dbb /pkgs/servers/sql | |
| parent | 0352d4fb72aace03e10d4110cfb6bd2f630aea63 (diff) | |
| download | nixpkgs-5ced92f83bb260c59d58daec8e871d8a349b4467.tar nixpkgs-5ced92f83bb260c59d58daec8e871d8a349b4467.tar.gz nixpkgs-5ced92f83bb260c59d58daec8e871d8a349b4467.tar.bz2 nixpkgs-5ced92f83bb260c59d58daec8e871d8a349b4467.tar.lz nixpkgs-5ced92f83bb260c59d58daec8e871d8a349b4467.tar.xz nixpkgs-5ced92f83bb260c59d58daec8e871d8a349b4467.tar.zst nixpkgs-5ced92f83bb260c59d58daec8e871d8a349b4467.zip | |
mariadb: fix build on darwin
My simplistic test seemed to work just fine, so I assume the install_name_tool shenanigans became unnecessary at some point.
Diffstat (limited to 'pkgs/servers/sql')
| -rw-r--r-- | pkgs/servers/sql/mariadb/default.nix | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 6091703c52c..370abd376ad 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -103,15 +103,6 @@ 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.out}/lib -lz,g' \ |