From 245df33c6c158eed36d9ee17fa41944437d536d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 13 Sep 2010 20:52:49 +0000 Subject: [PATCH] Making the system tarballs of fuloong and sheevaplug reference the proper nixpkgs, and not that of /etc/... svn path=/nixos/branches/stdenv-updates/; revision=23772 --- modules/installer/cd-dvd/system-tarball-fuloong2f.nix | 2 +- modules/installer/cd-dvd/system-tarball-sheevaplug.nix | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/modules/installer/cd-dvd/system-tarball-fuloong2f.nix b/modules/installer/cd-dvd/system-tarball-fuloong2f.nix index 8ef112cc476..72b358f846d 100644 --- a/modules/installer/cd-dvd/system-tarball-fuloong2f.nix +++ b/modules/installer/cd-dvd/system-tarball-fuloong2f.nix @@ -147,6 +147,6 @@ in system.boot.loader.kernelFile = "/vmlinux"; nixpkgs.config = { - platform = (import /etc/nixos/nixpkgs/pkgs/top-level/platforms.nix).fuloong2f_n32; + platform = pkgs.platforms.fuloong2f_n32; }; } diff --git a/modules/installer/cd-dvd/system-tarball-sheevaplug.nix b/modules/installer/cd-dvd/system-tarball-sheevaplug.nix index b834ae3ab3d..745e756a0b4 100644 --- a/modules/installer/cd-dvd/system-tarball-sheevaplug.nix +++ b/modules/installer/cd-dvd/system-tarball-sheevaplug.nix @@ -183,8 +183,6 @@ in jobs.openssh.startOn = pkgs.lib.mkOverride 50 {} ""; nixpkgs.config = { - packageOverrides = pkgs : rec { - }; - platform = (import /etc/nixos/nixpkgs/pkgs/top-level/platforms.nix).sheevaplug; + platform = pkgs.platforms.sheevaplug; }; }