From 357679e154dd9ed72390e4e92853ac095c328dbe Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Mon, 27 Jul 2009 20:37:12 +0000
Subject: [PATCH] if not linux, do not add rpm/dpkg/cdrkit to path

---
 release.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/release.nix b/release.nix
index 1bcda65b..fbb12173 100644
--- a/release.nix
+++ b/release.nix
@@ -6,7 +6,7 @@ let
 
     tarball =
       { hydraSrc ? {outPath = ./.; rev = 1234;}
-      , nixpkgs ? ../nixpkgs
+      , nixpkgs ? ../../nixpkgs
       , officialRelease ? false
       }:
 
@@ -50,7 +50,7 @@ let
 
     build = 
       { tarball ? jobs.tarball {}
-      , nixpkgs ? ../nixpkgs
+      , nixpkgs ? ../../nixpkgs
       , system ? "i686-linux"
       }:
 
@@ -71,12 +71,11 @@ let
           src=$(ls ${tarball}/tarballs/*.tar.bz2)
         ''; # */
 
-        hydraPath = stdenv.lib.concatStringsSep ":" (map (p: "${p}/bin") [
+        hydraPath = stdenv.lib.concatStringsSep ":" (map (p: "${p}/bin") ( [
           libxslt sqlite subversion openssh nix coreutils findutils
           gzip bzip2 lzma gnutar unzip
           gnused graphviz
-          rpm dpkg cdrkit
-        ]);
+        ] ++ ( if stdenv.isLinux then [rpm dpkg cdrkit] else [] )));
 
         installPhase = ''
           ensureDir $out/nix-support