diff options
| author | John Wiegley <johnw@newartisans.com> | 2014-12-17 12:11:30 -0600 |
|---|---|---|
| committer | John Wiegley <johnw@newartisans.com> | 2014-12-26 11:06:21 -0600 |
| commit | 28b6fb61e651a3e2cca57d087781e7ba6ab45e7c (patch) | |
| tree | 1931763370f483739474ebe0ab219eb0d7256c13 /pkgs/applications/networking/instant-messengers/hipchat | |
| parent | ce100a5d58799e65684ad948db70638c311369b3 (diff) | |
| download | nixpkgs-28b6fb61e651a3e2cca57d087781e7ba6ab45e7c.tar nixpkgs-28b6fb61e651a3e2cca57d087781e7ba6ab45e7c.tar.gz nixpkgs-28b6fb61e651a3e2cca57d087781e7ba6ab45e7c.tar.bz2 nixpkgs-28b6fb61e651a3e2cca57d087781e7ba6ab45e7c.tar.lz nixpkgs-28b6fb61e651a3e2cca57d087781e7ba6ab45e7c.tar.xz nixpkgs-28b6fb61e651a3e2cca57d087781e7ba6ab45e7c.tar.zst nixpkgs-28b6fb61e651a3e2cca57d087781e7ba6ab45e7c.zip | |
Change occurrences of gcc to the more general cc
This is done for the sake of Yosemite, which does not have gcc, and yet this change is also compatible with Linux.
Diffstat (limited to 'pkgs/applications/networking/instant-messengers/hipchat')
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/hipchat/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/networking/instant-messengers/hipchat/default.nix b/pkgs/applications/networking/instant-messengers/hipchat/default.nix index 5206db497b8..c2c69b0e2fb 100644 --- a/pkgs/applications/networking/instant-messengers/hipchat/default.nix +++ b/pkgs/applications/networking/instant-messengers/hipchat/default.nix @@ -41,7 +41,7 @@ let xz libcanberra xcbutilkeysyms - ] + ":${stdenv.gcc.gcc}/lib${stdenv.lib.optionalString stdenv.is64bit "64"}"; + ] + ":${stdenv.cc.gcc}/lib${stdenv.lib.optionalString stdenv.is64bit "64"}"; src = if stdenv.system == "x86_64-linux" then @@ -76,7 +76,7 @@ stdenv.mkDerivation { mv usr/share $out for file in $(find $d -type f); do - patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" $file || true + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $file || true patchelf --set-rpath ${rpath}:\$ORIGIN $file || true done |