if not linux, do not add rpm/dpkg/cdrkit to path
This commit is contained in:
parent
c1e6797d39
commit
357679e154
|
@ -6,7 +6,7 @@ let
|
||||||
|
|
||||||
tarball =
|
tarball =
|
||||||
{ hydraSrc ? {outPath = ./.; rev = 1234;}
|
{ hydraSrc ? {outPath = ./.; rev = 1234;}
|
||||||
, nixpkgs ? ../nixpkgs
|
, nixpkgs ? ../../nixpkgs
|
||||||
, officialRelease ? false
|
, officialRelease ? false
|
||||||
}:
|
}:
|
||||||
|
|
||||||
|
@ -50,7 +50,7 @@ let
|
||||||
|
|
||||||
build =
|
build =
|
||||||
{ tarball ? jobs.tarball {}
|
{ tarball ? jobs.tarball {}
|
||||||
, nixpkgs ? ../nixpkgs
|
, nixpkgs ? ../../nixpkgs
|
||||||
, system ? "i686-linux"
|
, system ? "i686-linux"
|
||||||
}:
|
}:
|
||||||
|
|
||||||
|
@ -71,12 +71,11 @@ let
|
||||||
src=$(ls ${tarball}/tarballs/*.tar.bz2)
|
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
|
libxslt sqlite subversion openssh nix coreutils findutils
|
||||||
gzip bzip2 lzma gnutar unzip
|
gzip bzip2 lzma gnutar unzip
|
||||||
gnused graphviz
|
gnused graphviz
|
||||||
rpm dpkg cdrkit
|
] ++ ( if stdenv.isLinux then [rpm dpkg cdrkit] else [] )));
|
||||||
]);
|
|
||||||
|
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
ensureDir $out/nix-support
|
ensureDir $out/nix-support
|
||||||
|
|
Loading…
Reference in a new issue