diff options
| author | zimbatm <zimbatm@zimbatm.com> | 2016-06-22 23:10:06 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-22 23:10:06 +0100 |
| commit | 926ec0a08cf8ac0966e8555e269a4ac2ded63a6f (patch) | |
| tree | e435f0cf23d0716ab2684162778fc1c068746be8 | |
| parent | 7c6969f8a068fad09d7f81a7c26c80b4b71c6e96 (diff) | |
| parent | 351352f68d14a18b2ecef53cdcf05196d17376b0 (diff) | |
| download | nixlib-926ec0a08cf8ac0966e8555e269a4ac2ded63a6f.tar nixlib-926ec0a08cf8ac0966e8555e269a4ac2ded63a6f.tar.gz nixlib-926ec0a08cf8ac0966e8555e269a4ac2ded63a6f.tar.bz2 nixlib-926ec0a08cf8ac0966e8555e269a4ac2ded63a6f.tar.lz nixlib-926ec0a08cf8ac0966e8555e269a4ac2ded63a6f.tar.xz nixlib-926ec0a08cf8ac0966e8555e269a4ac2ded63a6f.tar.zst nixlib-926ec0a08cf8ac0966e8555e269a4ac2ded63a6f.zip | |
Merge pull request #16415 from Ericson2314/gccWith
Remove gccWith* arguments which are unused
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 8 | ||||
| -rw-r--r-- | pkgs/top-level/default.nix | 7 |
2 files changed, 4 insertions, 11 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1539af89d4f3..574860710298 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1,5 +1,4 @@ -{ system, bootStdenv, noSysDirs, gccWithCC, gccWithProfiling -, config, crossSystem, platform, lib +{ system, bootStdenv, noSysDirs, config, crossSystem, platform, lib , pkgsWithOverrides , ... }: self: pkgs: @@ -46,8 +45,7 @@ in forceSystem = system: kernel: (import ../..) { inherit system; platform = platform // { kernelArch = kernel; }; - inherit bootStdenv noSysDirs gccWithCC gccWithProfiling config - crossSystem; + inherit bootStdenv noSysDirs config crossSystem; }; # Used by wine, firefox with debugging version of Flash, ... @@ -3977,7 +3975,7 @@ in let pkgsCross = (import ../..) { inherit system; - inherit bootStdenv noSysDirs gccWithCC gccWithProfiling config; + inherit bootStdenv noSysDirs config; # Ben Nanonote system crossSystem = { config = "mipsel-unknown-linux"; diff --git a/pkgs/top-level/default.nix b/pkgs/top-level/default.nix index bf3522d5946a..cff8671b65d5 100644 --- a/pkgs/top-level/default.nix +++ b/pkgs/top-level/default.nix @@ -19,10 +19,6 @@ && system != "x86_64-solaris" && 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 # argument. Otherwise, it's read from $NIXPKGS_CONFIG or # ~/.nixpkgs/config.nix. @@ -81,8 +77,7 @@ let else config.platform or platformAuto; topLevelArguments = { - inherit system bootStdenv noSysDirs gccWithCC gccWithProfiling config - crossSystem platform lib; + inherit system bootStdenv noSysDirs config crossSystem platform lib; }; # Allow packages to be overridden globally via the `packageOverrides' |