From d490dad864c7ff61eefc21a8c5bdf71aebf6627e Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 22 Apr 2019 21:20:49 -0400 Subject: [PATCH] treewide: use gcc when necessary Some build scripts depend on gcc being available. We use gccStdenv in this case. --- pkgs/top-level/all-packages.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3e253e838821..a75b2ecc9ae2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5746,7 +5746,7 @@ in fusesmb = callPackage ../tools/filesystems/fusesmb { samba = samba3; }; - sl = callPackage ../tools/misc/sl { }; + sl = callPackage ../tools/misc/sl { stdenv = gccStdenv; }; socat = callPackage ../tools/networking/socat { }; @@ -7855,7 +7855,9 @@ in tinycc = callPackage ../development/compilers/tinycc { }; - tinyscheme = callPackage ../development/interpreters/tinyscheme { }; + tinyscheme = callPackage ../development/interpreters/tinyscheme { + stdenv = gccStdenv; + }; inherit (ocaml-ng.ocamlPackages_4_02) trv; @@ -19056,7 +19058,9 @@ in openbox = callPackage ../applications/window-managers/openbox { }; - openbox-menu = callPackage ../applications/misc/openbox-menu { }; + openbox-menu = callPackage ../applications/misc/openbox-menu { + stdenv = gccStdenv; + }; openbrf = libsForQt5.callPackage ../applications/misc/openbrf { }; @@ -23208,7 +23212,9 @@ in fsuae = callPackage ../misc/emulators/fs-uae { }; - putty = callPackage ../applications/networking/remote/putty { }; + putty = callPackage ../applications/networking/remote/putty { + gtk2 = gtk2-x11; + }; qMasterPassword = libsForQt5.callPackage ../applications/misc/qMasterPassword { };