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/electronics | |
| 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/electronics')
| -rw-r--r-- | pkgs/applications/science/electronics/eagle/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/science/electronics/eagle/default.nix b/pkgs/applications/science/electronics/eagle/default.nix index 8693e45ce10f..dd8863b1c4ed 100644 --- a/pkgs/applications/science/electronics/eagle/default.nix +++ b/pkgs/applications/science/electronics/eagle/default.nix @@ -59,11 +59,11 @@ stdenv.mkDerivation rec { gcc -shared -fPIC -DEAGLE_PATH=\"$out/eagle-${version}\" ${./eagle_fixer.c} -o "$out"/lib/eagle_fixer.so -ldl # Make wrapper script - dynlinker="$(cat $NIX_GCC/nix-support/dynamic-linker)" + dynlinker="$(cat $NIX_CC/nix-support/dynamic-linker)" mkdir -p "$out"/bin cat > "$out"/bin/eagle << EOF #!${stdenv.shell} - export LD_LIBRARY_PATH="${stdenv.gcc.gcc}/lib:${libPath}" + export LD_LIBRARY_PATH="${stdenv.cc.gcc}/lib:${libPath}" export LD_PRELOAD="$out/lib/eagle_fixer.so" exec "$dynlinker" "$out/eagle-${version}/bin/eagle" "\$@" EOF |