public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

treewide: remove explicit overrides to gcc7

Browse Source 
They're not needed on this branch.
This commit is contained in:
Vladimír Čunát 2018-02-17 16:29:31 +01:00
parent c6d26b7f72
commit e96741cdb1
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
3 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
View File

@ -1,5 +1,5 @@
{ mkDerivation, lib, fetchgit, fetchpatch { mkDerivation, lib, fetchgit, fetchpatch
, pkgconfig, gyp, cmake, gcc7, makeWrapper , pkgconfig, gyp, cmake, makeWrapper
, qtbase, qtimageformats, gtk3, libappindicator-gtk3 , qtbase, qtimageformats, gtk3, libappindicator-gtk3
, dee, ffmpeg, openalSoft, minizip, libopus, alsaLib, libpulseaudio, range-v3 , dee, ffmpeg, openalSoft, minizip, libopus, alsaLib, libpulseaudio, range-v3
}: }:
@ -31,7 +31,7 @@ mkDerivation rec {
}) })
]; ];
nativeBuildInputs = [ pkgconfig gyp cmake gcc7 makeWrapper ]; nativeBuildInputs = [ pkgconfig gyp cmake makeWrapper ];
buildInputs = [ buildInputs = [
qtbase qtimageformats gtk3 libappindicator-gtk3 qtbase qtimageformats gtk3 libappindicator-gtk3

4
pkgs/development/python-modules/pythonix/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, ninja, meson, pkgconfig, gcc7, nixUnstable, isPy3k }: { stdenv, fetchFromGitHub, ninja, meson, pkgconfig, nixUnstable, isPy3k }:
assert isPy3k; assert isPy3k;
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
sha256 = "1piblysypyr442a6najk4mdh87xc377i2fdbfw6fr569z60mnnnj"; sha256 = "1piblysypyr442a6najk4mdh87xc377i2fdbfw6fr569z60mnnnj";
}; };
nativeBuildInputs = [ meson pkgconfig ninja gcc7 ]; nativeBuildInputs = [ meson pkgconfig ninja ];
buildInputs = [ nixUnstable ]; buildInputs = [ nixUnstable ];

11
pkgs/top-level/all-packages.nix
View File

@ -7055,12 +7055,7 @@ with pkgs;
pyrex096 = callPackage ../development/interpreters/pyrex/0.9.6.nix { }; pyrex096 = callPackage ../development/interpreters/pyrex/0.9.6.nix { };
racket = callPackage ../development/interpreters/racket { racket = callPackage ../development/interpreters/racket { };
# racket 6.11 doesn't build with gcc6 + recent glibc:
# https://github.com/racket/racket/pull/1886
# https://github.com/NixOS/nixpkgs/pull/31017#issuecomment-343574769
stdenv = overrideCC stdenv gcc7;
};
rakudo = callPackage ../development/interpreters/rakudo { rakudo = callPackage ../development/interpreters/rakudo {
inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices; inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices;
@ -18661,9 +18656,7 @@ with pkgs;
openmw = callPackage ../games/openmw { }; openmw = callPackage ../games/openmw { };
openmw-tes3mp = libsForQt5.callPackage ../games/openmw/tes3mp.nix { openmw-tes3mp = libsForQt5.callPackage ../games/openmw/tes3mp.nix { };
stdenv = overrideCC stdenv gcc7;
};
openra = callPackage ../games/openra { lua = lua5_1; }; openra = callPackage ../games/openra { lua = lua5_1; };