diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2017-08-28 16:07:06 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2017-09-01 11:44:55 -0400 |
| commit | 3f30cffa559e105017a1f88a8f3667a11a416870 (patch) | |
| tree | ed8a8ec90d9d686eff4eb5fa1189aea28e811045 /pkgs/servers | |
| parent | 40e9b2a7e6490eef782e5c34703a99e61fae7017 (diff) | |
| download | nixlib-3f30cffa559e105017a1f88a8f3667a11a416870.tar nixlib-3f30cffa559e105017a1f88a8f3667a11a416870.tar.gz nixlib-3f30cffa559e105017a1f88a8f3667a11a416870.tar.bz2 nixlib-3f30cffa559e105017a1f88a8f3667a11a416870.tar.lz nixlib-3f30cffa559e105017a1f88a8f3667a11a416870.tar.xz nixlib-3f30cffa559e105017a1f88a8f3667a11a416870.tar.zst nixlib-3f30cffa559e105017a1f88a8f3667a11a416870.zip | |
misc pkgs: Use $NIX_BINUTILS for when needed
Certain files are now only there instead of $NIX_CC (some are in both)
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/mattermost/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/servers/meteor/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/servers/monitoring/newrelic-sysmond/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/servers/sql/oracle-xe/default.nix | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/servers/mattermost/default.nix b/pkgs/servers/mattermost/default.nix index 4668ac240961..787c685e61e1 100644 --- a/pkgs/servers/mattermost/default.nix +++ b/pkgs/servers/mattermost/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ''; postFixup = '' - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/bin/platform + patchelf --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" $out/bin/platform ''; meta = with stdenv.lib; { diff --git a/pkgs/servers/meteor/default.nix b/pkgs/servers/meteor/default.nix index 0b82f1deef62..36384da20478 100644 --- a/pkgs/servers/meteor/default.nix +++ b/pkgs/servers/meteor/default.nix @@ -39,21 +39,21 @@ stdenv.mkDerivation rec { patch -p1 < ${./main.patch} popd substituteInPlace $out/tools/cli/main.js \ - --replace "@INTERPRETER@" "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --replace "@INTERPRETER@" "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ --replace "@RPATH@" "${lib.makeLibraryPath [ stdenv.cc.cc zlib ]}" \ --replace "@PATCHELF@" "${patchelf}/bin/patchelf" # Patch node. node=$devBundle/bin/node patchelf \ - --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + --set-interpreter $(cat $NIX_BINUTILS/nix-support/dynamic-linker) \ --set-rpath "$(patchelf --print-rpath $node):${stdenv.cc.cc.lib}/lib" \ $node # Patch mongo. for p in $devBundle/mongodb/bin/mongo{,d}; do patchelf \ - --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + --set-interpreter $(cat $NIX_BINUTILS/nix-support/dynamic-linker) \ --set-rpath "$(patchelf --print-rpath $p):${lib.makeLibraryPath [ stdenv.cc.cc zlib ]}" \ $p done diff --git a/pkgs/servers/monitoring/newrelic-sysmond/default.nix b/pkgs/servers/monitoring/newrelic-sysmond/default.nix index e9a9fcff2b93..8ba554d1b771 100644 --- a/pkgs/servers/monitoring/newrelic-sysmond/default.nix +++ b/pkgs/servers/monitoring/newrelic-sysmond/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin install -v -m755 daemon/nrsysmond.x64 $out/bin/nrsysmond - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + patchelf --set-interpreter "$(cat $NIX_BINUTILS/nix-support/dynamic-linker)" \ $out/bin/nrsysmond ''; diff --git a/pkgs/servers/sql/oracle-xe/default.nix b/pkgs/servers/sql/oracle-xe/default.nix index e86406cd469c..f499743d7621 100644 --- a/pkgs/servers/sql/oracle-xe/default.nix +++ b/pkgs/servers/sql/oracle-xe/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { \( -name '*.sh' \ -o -path "$basedir/bin/*" \ \) -print -exec "${patchelf}/bin/patchelf" \ - --interpreter "$(cat "$NIX_CC/nix-support/dynamic-linker")" \ + --interpreter "$(cat "$NIX_BINUTILS/nix-support/dynamic-linker")" \ --set-rpath "${libs}:$out/libexec/oracle/lib" \ --force-rpath '{}' \; ''; |