From 5ced92f83bb260c59d58daec8e871d8a349b4467 Mon Sep 17 00:00:00 2001 From: Dan Peebles Date: Sun, 17 Apr 2016 14:48:08 -0400 Subject: [PATCH] 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. --- pkgs/servers/sql/mariadb/default.nix | 9 --------- 1 file changed, 9 deletions(-) diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 6091703c52cd..370abd376adf 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' \