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/development/libraries/wtk | |
| 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/development/libraries/wtk')
| -rw-r--r-- | pkgs/development/libraries/wtk/builder.sh | 2 | ||||
| -rw-r--r-- | pkgs/development/libraries/wtk/default.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/libraries/wtk/builder.sh b/pkgs/development/libraries/wtk/builder.sh index 6db9469e46d..ef0085da924 100644 --- a/pkgs/development/libraries/wtk/builder.sh +++ b/pkgs/development/libraries/wtk/builder.sh @@ -22,6 +22,6 @@ for i in $libraries; do rpath=$rpath${rpath:+:}$i/lib done find $out -type f -perm +100 \ - -exec patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" {} \; + -exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" {} \; find $out -type f -perm +100 \ -exec patchelf --set-rpath "$rpath" {} \; diff --git a/pkgs/development/libraries/wtk/default.nix b/pkgs/development/libraries/wtk/default.nix index 1ff34d45ba3..8544513e580 100644 --- a/pkgs/development/libraries/wtk/default.nix +++ b/pkgs/development/libraries/wtk/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ unzip ]; - libraries = [ xlibs.libXpm xlibs.libXt xlibs.libX11 xlibs.libICE xlibs.libSM stdenv.gcc.gcc ]; + libraries = [ xlibs.libXpm xlibs.libXt xlibs.libX11 xlibs.libICE xlibs.libSM stdenv.cc.gcc ]; meta = { homepage = http://java.sun.com/products/sjwtoolkit/download.html; |