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

* Fix relative paths.

Browse Source 
svn path=/nixos/trunk/; revision=12823
This commit is contained in:
Eelco Dolstra 2008-09-08 09:36:54 +00:00
parent 21ee887b75
commit 5e88ff8269
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
installer/cd-dvd/rescue-cd.nix
View File

@ -1,10 +1,10 @@
{ platform ? __currentSystem { platform ? __currentSystem
, relName ? , relName ?
if builtins.pathExists ../relname if builtins.pathExists ../../relname
then builtins.readFile ../relname then builtins.readFile ../../relname
else "nixos-${builtins.readFile ../VERSION}" else "nixos-${builtins.readFile ../../VERSION}"
, compressImage ? false , compressImage ? false
, nixpkgsPath ? ../../nixpkgs , nixpkgsPath ? ../../../nixpkgs
}: }:
rec { rec {
@ -191,7 +191,7 @@ rec {
}; };
system = import ../system/system.nix { system = import ../../system/system.nix {
inherit configuration platform nixpkgsPath; inherit configuration platform nixpkgsPath;
}; };
@ -203,7 +203,7 @@ rec {
# 0.11 (you won't get the manual). # 0.11 (you won't get the manual).
manual = manual =
if builtins ? unsafeDiscardStringContext if builtins ? unsafeDiscardStringContext
then "${import ../doc/manual {inherit nixpkgsPath;}}/manual.html" then "${import ../../doc/manual {inherit nixpkgsPath;}}/manual.html"
else pkgs.writeText "dummy-manual" "Manual not included in this build!"; else pkgs.writeText "dummy-manual" "Manual not included in this build!";
@ -219,7 +219,7 @@ rec {
# Put the current directory in a tarball (making sure to filter # Put the current directory in a tarball (making sure to filter
# out crap like the .svn directories). # out crap like the .svn directories).
nixosTarball = makeTarball "nixos.tar.bz2" (builtins.filterSource svnFilter ./..); nixosTarball = makeTarball "nixos.tar.bz2" (builtins.filterSource svnFilter ./../..);
svnFilter = name: type: svnFilter = name: type:
let base = baseNameOf (toString name); let base = baseNameOf (toString name);
@ -252,7 +252,7 @@ rec {
# Create an ISO image containing the Grub boot loader, the kernel, # Create an ISO image containing the Grub boot loader, the kernel,
# the initrd produced above, and the closure of the stage 2 init. # the initrd produced above, and the closure of the stage 2 init.
rescueCD = import ../helpers/make-iso9660-image.nix { rescueCD = import ../../helpers/make-iso9660-image.nix {
inherit nixpkgsPath; inherit nixpkgsPath;
inherit (pkgs) stdenv perl cdrkit; inherit (pkgs) stdenv perl cdrkit;
isoName = "${relName}-${platform}.iso"; isoName = "${relName}-${platform}.iso";