diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2017-09-03 08:58:57 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2017-09-03 09:57:20 +0200 |
commit | 53998f5036f98a2f4928eb328c1678966fa8bea4 (patch) | |
tree | bcbf9883e49674d4fef0b05035b39e48c51af2b7 /pkgs/development | |
parent | ca12bd7a3f50296bffa052040afb3e7a65474687 (diff) | |
download | nixpkgs-53998f5036f98a2f4928eb328c1678966fa8bea4.tar nixpkgs-53998f5036f98a2f4928eb328c1678966fa8bea4.tar.gz nixpkgs-53998f5036f98a2f4928eb328c1678966fa8bea4.tar.bz2 nixpkgs-53998f5036f98a2f4928eb328c1678966fa8bea4.tar.lz nixpkgs-53998f5036f98a2f4928eb328c1678966fa8bea4.tar.xz nixpkgs-53998f5036f98a2f4928eb328c1678966fa8bea4.tar.zst nixpkgs-53998f5036f98a2f4928eb328c1678966fa8bea4.zip |
treewide: purge explicit usage of gcc6
It's now the default. /cc #19456 This makes a real build simplification, because in our current bootstrapping+aliases, `gcc6` attribute is not the default compiler but a derivation *built by* the default compiler. nix-exec didn't build before this commit already
Diffstat (limited to 'pkgs/development')
4 files changed, 9 insertions, 9 deletions
diff --git a/pkgs/development/interpreters/nix-exec/default.nix b/pkgs/development/interpreters/nix-exec/default.nix index 78eb04601cd..dea3f6ec633 100644 --- a/pkgs/development/interpreters/nix-exec/default.nix +++ b/pkgs/development/interpreters/nix-exec/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, nix, git, gcc6 }: let +{ stdenv, fetchurl, pkgconfig, nix, git }: let version = "4.1.6"; in stdenv.mkDerivation { name = "nix-exec-${version}"; @@ -8,7 +8,7 @@ in stdenv.mkDerivation { sha256 = "0slpsnzzzdkf5d9za7j4kr15jr4mn1k9klfsxibzy47b2bx1vkar"; }; - buildInputs = [ pkgconfig nix git gcc6 ]; + buildInputs = [ pkgconfig nix git ]; NIX_CFLAGS_COMPILE = "-std=c++1y"; diff --git a/pkgs/development/libraries/audio/suil/default.nix b/pkgs/development/libraries/audio/suil/default.nix index f0dbdcc7daf..8864d710174 100644 --- a/pkgs/development/libraries/audio/suil/default.nix +++ b/pkgs/development/libraries/audio/suil/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, gtk2, lv2, pkgconfig, python, serd, sord, sratom, gcc6 +{ stdenv, lib, fetchurl, gtk2, lv2, pkgconfig, python, serd, sord, sratom , withQt4 ? true, qt4 ? null , withQt5 ? false, qt5 ? null }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { sha256 = "1kji3lhha26qr6xm9j8ic5c40zbrrb5qnwm2qxzmsfxgmrz29wkf"; }; - buildInputs = [ gtk2 lv2 pkgconfig python serd sord sratom gcc6 ] + buildInputs = [ gtk2 lv2 pkgconfig python serd sord sratom ] ++ (lib.optionals withQt4 [ qt4 ]) ++ (lib.optionals withQt5 (with qt5; [ qtbase qttools ])); diff --git a/pkgs/development/libraries/libjson-rpc-cpp/default.nix b/pkgs/development/libraries/libjson-rpc-cpp/default.nix index 6487e9267be..7c0bc358ea9 100644 --- a/pkgs/development/libraries/libjson-rpc-cpp/default.nix +++ b/pkgs/development/libraries/libjson-rpc-cpp/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, cmake, jsoncpp, argtable, curl, libmicrohttpd -, doxygen, catch, pkgconfig, git, gcc6 +, doxygen, catch, pkgconfig, git }: stdenv.mkDerivation rec { @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { function fixRunPath { p=$(patchelf --print-rpath $1) - q="$p:${stdenv.lib.makeLibraryPath [ gcc6 jsoncpp argtable libmicrohttpd curl ]}:$out/lib" + q="$p:${stdenv.lib.makeLibraryPath [ jsoncpp argtable libmicrohttpd curl ]}:$out/lib" patchelf --set-rpath $q $1 } @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { cp -r Install/* $out ''; - nativeBuildInputs = [ pkgconfig gcc6 ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ cmake jsoncpp argtable curl libmicrohttpd doxygen catch ]; meta = with stdenv.lib; { diff --git a/pkgs/development/pure-modules/octave/default.nix b/pkgs/development/pure-modules/octave/default.nix index f1a54eb50ae..8fbb1dac320 100644 --- a/pkgs/development/pure-modules/octave/default.nix +++ b/pkgs/development/pure-modules/octave/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, pure, octave, gcc6 }: +{ stdenv, fetchurl, pkgconfig, pure, octave }: stdenv.mkDerivation rec { baseName = "octave"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "0l1mvmi3rpabzjcrk6p04rdn922mvdm9x67zby3dha5iiccc47q0"; }; - buildInputs = [ pkgconfig gcc6 ]; + nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ pure octave ]; makeFlags = "libdir=$(out)/lib prefix=$(out)/"; setupHook = ../generic-setup-hook.sh; |