Remove unnecessary references to gcc5

These cause an unnecessary rebuild of gcc.
This commit is contained in:
Eelco Dolstra 2016-07-07 11:30:36 +02:00
parent 2aadeb2cb5
commit 05bdc0c89f
3 changed files with 6 additions and 6 deletions

View File

@ -3,7 +3,7 @@
cln, cln,
cmake, cmake,
fetchgit, fetchgit,
gcc5, gcc,
ginac, ginac,
jamomacore, jamomacore,
kde5, kde5,
@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
cln cln
cmake cmake
ginac ginac
gcc5 gcc
jamomacore jamomacore
kde5.kdnssd kde5.kdnssd
libsndfile libsndfile

View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, gcc5 }: { stdenv, fetchFromGitHub, gcc }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "icmake-${version}"; name = "icmake-${version}";
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
sourceRoot = "icmake-${version}-src/icmake"; sourceRoot = "icmake-${version}-src/icmake";
buildInputs = [ gcc5 ]; buildInputs = [ gcc ];
preConfigure = '' preConfigure = ''
patchShebangs ./ patchShebangs ./

View File

@ -1,4 +1,4 @@
{ stdenv, gcc5, pkgconfig, cmake, bluez, ffmpeg, libao, mesa, gtk2, glib { stdenv, gcc, pkgconfig, cmake, bluez, ffmpeg, libao, mesa, gtk2, glib
, gettext, git, libpthreadstubs, libXrandr, libXext, readline , gettext, git, libpthreadstubs, libXrandr, libXext, readline
, openal, libXdmcp, portaudio, fetchgit, libusb, libevdev , openal, libXdmcp, portaudio, fetchgit, libusb, libevdev
, libpulseaudio ? null }: , libpulseaudio ? null }:
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true; enableParallelBuilding = true;
buildInputs = [ gcc5 pkgconfig cmake bluez ffmpeg libao mesa gtk2 glib buildInputs = [ gcc pkgconfig cmake bluez ffmpeg libao mesa gtk2 glib
gettext libpthreadstubs libXrandr libXext readline openal gettext libpthreadstubs libXrandr libXext readline openal
libevdev git libXdmcp portaudio libusb libpulseaudio ]; libevdev git libXdmcp portaudio libusb libpulseaudio ];