From 05bdc0c89f861aae1a7df5aaeb5de358daf79ec6 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 7 Jul 2016 11:30:36 +0200 Subject: [PATCH] Remove unnecessary references to gcc5 These cause an unnecessary rebuild of gcc. --- pkgs/applications/audio/i-score/default.nix | 4 ++-- pkgs/development/tools/build-managers/icmake/default.nix | 4 ++-- pkgs/misc/emulators/dolphin-emu/master.nix | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/audio/i-score/default.nix b/pkgs/applications/audio/i-score/default.nix index 17fadfe8b1f..97e8f5f1429 100644 --- a/pkgs/applications/audio/i-score/default.nix +++ b/pkgs/applications/audio/i-score/default.nix @@ -3,7 +3,7 @@ cln, cmake, fetchgit, - gcc5, + gcc, ginac, jamomacore, kde5, @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { cln cmake ginac - gcc5 + gcc jamomacore kde5.kdnssd libsndfile diff --git a/pkgs/development/tools/build-managers/icmake/default.nix b/pkgs/development/tools/build-managers/icmake/default.nix index e4bad4f500c..8fd519073cc 100644 --- a/pkgs/development/tools/build-managers/icmake/default.nix +++ b/pkgs/development/tools/build-managers/icmake/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, gcc5 }: +{ stdenv, fetchFromGitHub, gcc }: stdenv.mkDerivation rec { name = "icmake-${version}"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sourceRoot = "icmake-${version}-src/icmake"; - buildInputs = [ gcc5 ]; + buildInputs = [ gcc ]; preConfigure = '' patchShebangs ./ diff --git a/pkgs/misc/emulators/dolphin-emu/master.nix b/pkgs/misc/emulators/dolphin-emu/master.nix index 9743261c6b2..4d8b8ac0eb6 100644 --- a/pkgs/misc/emulators/dolphin-emu/master.nix +++ b/pkgs/misc/emulators/dolphin-emu/master.nix @@ -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 , openal, libXdmcp, portaudio, fetchgit, libusb, libevdev , libpulseaudio ? null }: @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { 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 libevdev git libXdmcp portaudio libusb libpulseaudio ];