From 7fe1c5fe90a24780ca52c1315f76416a4bdbe2c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
<viric@vicerveza.homeunix.net>
Date: Wed, 8 Sep 2010 16:52:15 +0000
Subject: [PATCH] Making eval-config not pass 'platform' as a nixpkgs
parameter, but expect a nixpkgs config attribute.
svn path=/nixos/branches/stdenv-updates/; revision=23688
---
lib/eval-config.nix | 2 +-
modules/misc/nixpkgs.nix | 7 -------
2 files changed, 1 insertion(+), 8 deletions(-)
diff --git a/lib/eval-config.nix b/lib/eval-config.nix
index 8a7b225e8500..e3bccb775aa5 100644
--- a/lib/eval-config.nix
+++ b/lib/eval-config.nix
@@ -60,7 +60,7 @@ rec {
in
{
inherit system;
- inherit (nixpkgsOptions) config platform;
+ inherit (nixpkgsOptions) config;
});
# Optionally check wether all config values have corresponding
diff --git a/modules/misc/nixpkgs.nix b/modules/misc/nixpkgs.nix
index 8173d716d841..2fb61f686f0b 100644
--- a/modules/misc/nixpkgs.nix
+++ b/modules/misc/nixpkgs.nix
@@ -13,12 +13,5 @@
'';
};
- nixpkgs.platform = pkgs.lib.mkOption {
- default = pkgs.platforms.pc;
- description = ''
- The platform for the Nix Packages collection.
- '';
- };
-
};
}