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

build-fhs-*: prefer local build

Browse Source
This commit is contained in:
Nikolay Amiantov 2015-02-05 20:39:01 +03:00
parent 627f8178b8
commit 3500978b8f
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/build-support/build-fhs-chrootenv/default.nix
View File

@ -11,7 +11,8 @@ let
name = env.pname; name = env.pname;
in stdenv.mkDerivation { in stdenv.mkDerivation {
name = "${name}-chrootenv"; name = "${name}-chrootenv";
preferLocalBuild = true;
buildCommand = '' buildCommand = ''
mkdir -p $out/bin mkdir -p $out/bin
cd $out/bin cd $out/bin

1
pkgs/build-support/build-fhs-chrootenv/env.nix
View File

@ -170,6 +170,7 @@ in nixpkgs.stdenv.mkDerivation {
cd $out cd $out
${if isMultiBuild then extraBuildCommandsMulti else ""} ${if isMultiBuild then extraBuildCommandsMulti else ""}
''; '';
preferLocalBuild = true;
passthru = { passthru = {
pname = name; pname = name;
}; };

3
pkgs/build-support/build-fhs-userenv/default.nix
View File

@ -15,8 +15,9 @@ let
}; };
in stdenv.mkDerivation { in stdenv.mkDerivation {
name = "${name}-userenv"; name = "${name}-userenv";
buildInputs = [ ruby ]; buildInputs = [ ruby ];
preferLocalBuild = true;
buildCommand = '' buildCommand = ''
mkdir -p $out/bin mkdir -p $out/bin
cat > $out/bin/${name} <<EOF cat > $out/bin/${name} <<EOF