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

Merge pull request #16415 from Ericson2314/gccWith

Browse Source 
Remove gccWith* arguments which are unused
This commit is contained in:
zimbatm 2016-06-22 23:10:06 +01:00 committed by GitHub
commit 926ec0a08c
2 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,4 @@
{ system, bootStdenv, noSysDirs, gccWithCC, gccWithProfiling { system, bootStdenv, noSysDirs, config, crossSystem, platform, lib
, config, crossSystem, platform, lib
, pkgsWithOverrides , pkgsWithOverrides
, ... }: , ... }:
self: pkgs: self: pkgs:
@ -46,8 +45,7 @@ in
forceSystem = system: kernel: (import ../..) { forceSystem = system: kernel: (import ../..) {
inherit system; inherit system;
platform = platform // { kernelArch = kernel; }; platform = platform // { kernelArch = kernel; };
inherit bootStdenv noSysDirs gccWithCC gccWithProfiling config inherit bootStdenv noSysDirs config crossSystem;
crossSystem;
}; };
# Used by wine, firefox with debugging version of Flash, ... # Used by wine, firefox with debugging version of Flash, ...
@ -3977,7 +3975,7 @@ in
let let
pkgsCross = (import ../..) { pkgsCross = (import ../..) {
inherit system; inherit system;
inherit bootStdenv noSysDirs gccWithCC gccWithProfiling config; inherit bootStdenv noSysDirs config;
# Ben Nanonote system # Ben Nanonote system
crossSystem = { crossSystem = {
config = "mipsel-unknown-linux"; config = "mipsel-unknown-linux";

7
pkgs/top-level/default.nix
View File

@ -19,10 +19,6 @@
&& system != "x86_64-solaris" && system != "x86_64-solaris"
&& system != "x86_64-kfreebsd-gnu") && system != "x86_64-kfreebsd-gnu")
# More flags for the bootstrapping of stdenv.
, gccWithCC ? true
, gccWithProfiling ? true
, # Allow a configuration attribute set to be passed in as an , # Allow a configuration attribute set to be passed in as an
# argument. Otherwise, it's read from $NIXPKGS_CONFIG or # argument. Otherwise, it's read from $NIXPKGS_CONFIG or
# ~/.nixpkgs/config.nix. # ~/.nixpkgs/config.nix.
@ -81,8 +77,7 @@ let
else config.platform or platformAuto; else config.platform or platformAuto;
topLevelArguments = { topLevelArguments = {
inherit system bootStdenv noSysDirs gccWithCC gccWithProfiling config inherit system bootStdenv noSysDirs config crossSystem platform lib;
crossSystem platform lib;
}; };
# Allow packages to be overridden globally via the `packageOverrides' # Allow packages to be overridden globally via the `packageOverrides'