diff options
Diffstat (limited to 'pkgs/servers')
-rw-r--r-- | pkgs/servers/http/openresty/default.nix | 2 | ||||
-rw-r--r-- | pkgs/servers/monitoring/zabbix/2.0.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/monitoring/zabbix/2.2.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/monitoring/zabbix/default.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/nosql/influxdb/default.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/restund/default.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/samba/default.nix | 2 | ||||
-rw-r--r-- | pkgs/servers/sql/oracle-xe/default.nix | 2 | ||||
-rw-r--r-- | pkgs/servers/sql/virtuoso/6.x.nix | 2 | ||||
-rw-r--r-- | pkgs/servers/sql/virtuoso/7.x.nix | 2 |
10 files changed, 15 insertions, 15 deletions
diff --git a/pkgs/servers/http/openresty/default.nix b/pkgs/servers/http/openresty/default.nix index 8c878e856b8..245fc98fb4d 100644 --- a/pkgs/servers/http/openresty/default.nix +++ b/pkgs/servers/http/openresty/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { preConfigure = '' export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${libxml2}/include/libxml2 $additionalFlags" - export PATH="$PATH:${stdenv.gcc.libc}/sbin" + export PATH="$PATH:${stdenv.cc.libc}/sbin" patchShebangs . ''; diff --git a/pkgs/servers/monitoring/zabbix/2.0.nix b/pkgs/servers/monitoring/zabbix/2.0.nix index 399fb54875a..9ce027409fd 100644 --- a/pkgs/servers/monitoring/zabbix/2.0.nix +++ b/pkgs/servers/monitoring/zabbix/2.0.nix @@ -17,8 +17,8 @@ let '' substituteInPlace ./configure \ --replace " -static" "" \ - ${stdenv.lib.optionalString (stdenv.gcc.libc != null) '' - --replace /usr/include/iconv.h ${stdenv.gcc.libc}/include/iconv.h + ${stdenv.lib.optionalString (stdenv.cc.libc != null) '' + --replace /usr/include/iconv.h ${stdenv.cc.libc}/include/iconv.h ''} ''; diff --git a/pkgs/servers/monitoring/zabbix/2.2.nix b/pkgs/servers/monitoring/zabbix/2.2.nix index df9da3c467b..1e8d03ec2b6 100644 --- a/pkgs/servers/monitoring/zabbix/2.2.nix +++ b/pkgs/servers/monitoring/zabbix/2.2.nix @@ -22,8 +22,8 @@ let '' substituteInPlace ./configure \ --replace " -static" "" \ - ${stdenv.lib.optionalString (stdenv.gcc.libc != null) '' - --replace /usr/include/iconv.h ${stdenv.gcc.libc}/include/iconv.h + ${stdenv.lib.optionalString (stdenv.cc.libc != null) '' + --replace /usr/include/iconv.h ${stdenv.cc.libc}/include/iconv.h ''} ''; diff --git a/pkgs/servers/monitoring/zabbix/default.nix b/pkgs/servers/monitoring/zabbix/default.nix index 47f1b7a867b..5d8541ab870 100644 --- a/pkgs/servers/monitoring/zabbix/default.nix +++ b/pkgs/servers/monitoring/zabbix/default.nix @@ -13,8 +13,8 @@ let '' substituteInPlace ./configure \ --replace " -static" "" \ - ${stdenv.lib.optionalString (stdenv.gcc.libc != null) '' - --replace /usr/include/iconv.h ${stdenv.gcc.libc}/include/iconv.h + ${stdenv.lib.optionalString (stdenv.cc.libc != null) '' + --replace /usr/include/iconv.h ${stdenv.cc.libc}/include/iconv.h ''} ''; diff --git a/pkgs/servers/nosql/influxdb/default.nix b/pkgs/servers/nosql/influxdb/default.nix index 3eba1b9f895..34336095214 100644 --- a/pkgs/servers/nosql/influxdb/default.nix +++ b/pkgs/servers/nosql/influxdb/default.nix @@ -18,9 +18,9 @@ stdenv.mkDerivation rec { installPhase = '' install -D influxdb $out/bin/influxdb - patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" $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.gcc.gcc}/lib:${stdenv.gcc.gcc}/lib64:${zlib}/lib:${bzip2}/lib" + --prefix LD_LIBRARY_PATH : "${stdenv.cc.gcc}/lib:${stdenv.cc.gcc}/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 cf07d0e6e3e..b6fd650086f 100644 --- a/pkgs/servers/restund/default.nix +++ b/pkgs/servers/restund/default.nix @@ -15,8 +15,8 @@ stdenv.mkDerivation rec { ''PREFIX=$(out)'' "USE_MYSQL=1" ] - ++ stdenv.lib.optional (stdenv.gcc.gcc != null) "SYSROOT_ALT=${stdenv.gcc.gcc}" - ++ stdenv.lib.optional (stdenv.gcc.libc != null) "SYSROOT=${stdenv.gcc.libc}" + ++ stdenv.lib.optional (stdenv.cc.gcc != null) "SYSROOT_ALT=${stdenv.cc.gcc}" + ++ stdenv.lib.optional (stdenv.cc.libc != null) "SYSROOT=${stdenv.cc.libc}" ; NIX_LDFLAGS='' -L${mysql}/lib/mysql ''; meta = { diff --git a/pkgs/servers/samba/default.nix b/pkgs/servers/samba/default.nix index 08f12d97506..b0b1b152e9b 100644 --- a/pkgs/servers/samba/default.nix +++ b/pkgs/servers/samba/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { "--localstatedir=/var" ] ++ (stdenv.lib.optional winbind "--with-winbind") - ++ (stdenv.lib.optional (stdenv.gcc.libc != null) "--with-libiconv=${stdenv.gcc.libc}"); + ++ (stdenv.lib.optional (stdenv.cc.libc != null) "--with-libiconv=${stdenv.cc.libc}"); # Need to use a DESTDIR because `make install' tries to write in /var and /etc. installFlags = "DESTDIR=$(TMPDIR)/inst"; diff --git a/pkgs/servers/sql/oracle-xe/default.nix b/pkgs/servers/sql/oracle-xe/default.nix index cd333152a2a..cb150fc5fd4 100644 --- a/pkgs/servers/sql/oracle-xe/default.nix +++ b/pkgs/servers/sql/oracle-xe/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { \( -name '*.sh' \ -o -path "$basedir/bin/*" \ \) -print -exec "${patchelf}/bin/patchelf" \ - --interpreter "$(cat "$NIX_GCC/nix-support/dynamic-linker")" \ + --interpreter "$(cat "$NIX_CC/nix-support/dynamic-linker")" \ --set-rpath "${libs}:$out/libexec/oracle/lib" \ --force-rpath '{}' \; ''; diff --git a/pkgs/servers/sql/virtuoso/6.x.nix b/pkgs/servers/sql/virtuoso/6.x.nix index 9453b8d2cdb..4de0ace0c03 100644 --- a/pkgs/servers/sql/virtuoso/6.x.nix +++ b/pkgs/servers/sql/virtuoso/6.x.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [ libxml2 openssl readline gawk ]; - CPP = "${stdenv.gcc}/bin/gcc -E"; + CPP = "${stdenv.cc}/bin/gcc -E"; configureFlags = " --enable-shared --disable-all-vads --with-readline=${readline} diff --git a/pkgs/servers/sql/virtuoso/7.x.nix b/pkgs/servers/sql/virtuoso/7.x.nix index 0c310b18901..de610f9a729 100644 --- a/pkgs/servers/sql/virtuoso/7.x.nix +++ b/pkgs/servers/sql/virtuoso/7.x.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [ libxml2 openssl readline gawk ]; - CPP = "${stdenv.gcc}/bin/gcc -E"; + CPP = "${stdenv.cc}/bin/gcc -E"; configureFlags = " --enable-shared --disable-all-vads --with-readline=${readline} |