Skip to content

Commit

Permalink
mariadb: fix multiple outputs on darwin
Browse files Browse the repository at this point in the history
  • Loading branch information
Jude Taylor committed Oct 29, 2015
1 parent 91bc2e9 commit 86dae70
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions pkgs/servers/sql/mariadb/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,12 @@ stdenv.mkDerivation rec {
mv $out/lib $lib
mv $out/include $lib
# 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' \
Expand Down

3 comments on commit 86dae70

@ttuegel
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@pikajude This breaks the build on NixOS x86_64 with the error:

/nix/store/h84kc62s87mknjrln5rd6s332zfxfrk5-stdenv/setup: line 86: install_name_tool: command not found

@vcunat
Copy link
Member

@vcunat vcunat commented on 86dae70 Oct 29, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be darwin-only, of course. Moreover, it causes a nontrivial rebuild, at least on Linux.

@vcunat
Copy link
Member

@vcunat vcunat commented on 86dae70 Oct 30, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sigh, fixed in 4e1fdad.

Please sign in to comment.