about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJohn Ericson <Ericson2314@Yahoo.com>2016-04-27 07:15:07 -0700
committerJohn Ericson <Ericson2314@Yahoo.com>2016-06-22 00:45:05 -0700
commit351352f68d14a18b2ecef53cdcf05196d17376b0 (patch)
tree1b1892e8c442aba1e9b1f82757c3e694eec98241
parent6a61621cb4e93ff50b5dac7dc8900acc55184ed1 (diff)
downloadnixlib-351352f68d14a18b2ecef53cdcf05196d17376b0.tar
nixlib-351352f68d14a18b2ecef53cdcf05196d17376b0.tar.gz
nixlib-351352f68d14a18b2ecef53cdcf05196d17376b0.tar.bz2
nixlib-351352f68d14a18b2ecef53cdcf05196d17376b0.tar.lz
nixlib-351352f68d14a18b2ecef53cdcf05196d17376b0.tar.xz
nixlib-351352f68d14a18b2ecef53cdcf05196d17376b0.tar.zst
nixlib-351352f68d14a18b2ecef53cdcf05196d17376b0.zip
Remove gccWith* arguments which are unused
-rw-r--r--pkgs/top-level/all-packages.nix8
-rw-r--r--pkgs/top-level/default.nix7
2 files changed, 4 insertions, 11 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 877145395ec1..565cbc8494a7 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, ...
@@ -3946,7 +3944,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'