diff options
author | Eric Seidel <gridaphobe@gmail.com> | 2015-01-14 20:25:26 -0800 |
---|---|---|
committer | Eric Seidel <gridaphobe@gmail.com> | 2015-01-14 20:27:55 -0800 |
commit | f3c6827373be102caae5dcbadd31e73ed60fa17f (patch) | |
tree | 9f9d57c16edc218bd590ca9956eb5227d084c33f /pkgs/servers | |
parent | 16fe4be790f541d68c01897640fda11f9673b8e9 (diff) |
rename all occurrences of stdenv.cc.gcc to stdenv.cc.cc
Diffstat (limited to 'pkgs/servers')
-rw-r--r-- | pkgs/servers/nosql/influxdb/default.nix | 2 | ||||
-rw-r--r-- | pkgs/servers/restund/default.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/servers/nosql/influxdb/default.nix b/pkgs/servers/nosql/influxdb/default.nix index 3433609521469..03a3a9cd43afa 100644 --- a/pkgs/servers/nosql/influxdb/default.nix +++ b/pkgs/servers/nosql/influxdb/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { install -D influxdb $out/bin/influxdb patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/bin/influxdb wrapProgram "$out/bin/influxdb" \ - --prefix LD_LIBRARY_PATH : "${stdenv.cc.gcc}/lib:${stdenv.cc.gcc}/lib64:${zlib}/lib:${bzip2}/lib" + --prefix LD_LIBRARY_PATH : "${stdenv.cc.cc}/lib:${stdenv.cc.cc}/lib64:${zlib}/lib:${bzip2}/lib" mkdir -p $out/share/influxdb cp -R admin scripts config.toml $out/share/influxdb diff --git a/pkgs/servers/restund/default.nix b/pkgs/servers/restund/default.nix index b6fd650086f92..65e957852fbfc 100644 --- a/pkgs/servers/restund/default.nix +++ b/pkgs/servers/restund/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { ''PREFIX=$(out)'' "USE_MYSQL=1" ] - ++ stdenv.lib.optional (stdenv.cc.gcc != null) "SYSROOT_ALT=${stdenv.cc.gcc}" + ++ stdenv.lib.optional (stdenv.cc.cc != null) "SYSROOT_ALT=${stdenv.cc.cc}" ++ stdenv.lib.optional (stdenv.cc.libc != null) "SYSROOT=${stdenv.cc.libc}" ; NIX_LDFLAGS='' -L${mysql}/lib/mysql ''; |