diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2018-02-17 16:29:31 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2018-02-17 16:29:31 +0100 |
commit | e96741cdb153fda08dee5a10ab636a947bbcaf78 (patch) | |
tree | d97c15b30244959f7c8a494381b338ad84e9826b /pkgs | |
parent | c6d26b7f72247bd4d7f0d738dbf48cb605567e0b (diff) |
treewide: remove explicit overrides to gcc7
They're not needed on this branch.
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/python-modules/pythonix/default.nix | 4 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 11 |
3 files changed, 6 insertions, 13 deletions
diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index c4158d280e2b7..34f0d16a7b430 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -1,5 +1,5 @@ { mkDerivation, lib, fetchgit, fetchpatch -, pkgconfig, gyp, cmake, gcc7, makeWrapper +, pkgconfig, gyp, cmake, makeWrapper , qtbase, qtimageformats, gtk3, libappindicator-gtk3 , 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 = [ qtbase qtimageformats gtk3 libappindicator-gtk3 diff --git a/pkgs/development/python-modules/pythonix/default.nix b/pkgs/development/python-modules/pythonix/default.nix index dacc27c53a05d..6248ed7bf66a6 100644 --- a/pkgs/development/python-modules/pythonix/default.nix +++ b/pkgs/development/python-modules/pythonix/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, ninja, meson, pkgconfig, gcc7, nixUnstable, isPy3k }: +{ stdenv, fetchFromGitHub, ninja, meson, pkgconfig, nixUnstable, isPy3k }: assert isPy3k; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "1piblysypyr442a6najk4mdh87xc377i2fdbfw6fr569z60mnnnj"; }; - nativeBuildInputs = [ meson pkgconfig ninja gcc7 ]; + nativeBuildInputs = [ meson pkgconfig ninja ]; buildInputs = [ nixUnstable ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 53b673a6a6290..a5f4cf2d849b1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7055,12 +7055,7 @@ with pkgs; pyrex096 = callPackage ../development/interpreters/pyrex/0.9.6.nix { }; - 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; - }; + racket = callPackage ../development/interpreters/racket { }; rakudo = callPackage ../development/interpreters/rakudo { inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices; @@ -18661,9 +18656,7 @@ with pkgs; openmw = callPackage ../games/openmw { }; - openmw-tes3mp = libsForQt5.callPackage ../games/openmw/tes3mp.nix { - stdenv = overrideCC stdenv gcc7; - }; + openmw-tes3mp = libsForQt5.callPackage ../games/openmw/tes3mp.nix { }; openra = callPackage ../games/openra { lua = lua5_1; }; |