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/science/logic | |
parent | ce100a5d58799e65684ad948db70638c311369b3 (diff) | |
download | nixlib-28b6fb61e651a3e2cca57d087781e7ba6ab45e7c.tar nixlib-28b6fb61e651a3e2cca57d087781e7ba6ab45e7c.tar.gz nixlib-28b6fb61e651a3e2cca57d087781e7ba6ab45e7c.tar.bz2 nixlib-28b6fb61e651a3e2cca57d087781e7ba6ab45e7c.tar.lz nixlib-28b6fb61e651a3e2cca57d087781e7ba6ab45e7c.tar.xz nixlib-28b6fb61e651a3e2cca57d087781e7ba6ab45e7c.tar.zst nixlib-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/science/logic')
-rw-r--r-- | pkgs/applications/science/logic/verifast/default.nix | 6 | ||||
-rw-r--r-- | pkgs/applications/science/logic/yices/default.nix | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/applications/science/logic/verifast/default.nix b/pkgs/applications/science/logic/verifast/default.nix index 2685f5e53d06..797333d5bd86 100644 --- a/pkgs/applications/science/logic/verifast/default.nix +++ b/pkgs/applications/science/logic/verifast/default.nix @@ -5,12 +5,12 @@ assert stdenv.isLinux; let libPath = stdenv.lib.makeLibraryPath - [ stdenv.gcc.libc stdenv.gcc.gcc gtk gdk_pixbuf atk pango glib cairo + [ stdenv.cc.libc stdenv.cc.gcc gtk gdk_pixbuf atk pango glib cairo freetype fontconfig libxml2 gnome2.gtksourceview - ] + ":${stdenv.gcc.gcc}/lib64"; + ] + ":${stdenv.cc.gcc}/lib64"; patchExe = x: '' - patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ + patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath ${libPath} ${x} ''; in diff --git a/pkgs/applications/science/logic/yices/default.nix b/pkgs/applications/science/logic/yices/default.nix index b6b34d96d154..e181ecfd0e11 100644 --- a/pkgs/applications/science/logic/yices/default.nix +++ b/pkgs/applications/science/logic/yices/default.nix @@ -3,7 +3,7 @@ assert stdenv.isLinux; let - libPath = stdenv.lib.makeLibraryPath [ stdenv.gcc.libc ]; + libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.libc ]; in stdenv.mkDerivation rec { name = "yices-${version}"; |