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/pure-modules/octave | |
| 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/pure-modules/octave')
| -rw-r--r-- | pkgs/development/pure-modules/octave/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
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; |