1
0
Fork 0
mirror of https://github.com/NixOS/nix-pills synced 2024-09-19 04:00:13 -04:00

Merge pull request #41 from willprice/fix-pill-8-gnu-hello-missing-ar

Pill 8: Fix missing ar binary in build environment
This commit is contained in:
Graham Christensen 2017-12-30 18:23:40 -05:00 committed by GitHub
commit cad67023d7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 4 deletions

View file

@ -3,7 +3,7 @@ pkgs: attrs:
let defaultAttrs = {
builder = "${bash}/bin/bash";
args = [ ./builder.sh ];
baseInputs = [ gnutar gzip gnumake gcc binutils coreutils gawk gnused gnugrep ];
baseInputs = [ gnutar gzip gnumake gcc binutils-unwrapped coreutils gawk gnused gnugrep ];
buildInputs = [];
system = builtins.currentSystem;
};

View file

@ -1,4 +1,4 @@
export PATH="$gnutar/bin:$gcc/bin:$gnumake/bin:$coreutils/bin:$gawk/bin:$gzip/bin:$gnugrep/bin:$gnused/bin:$binutils/bin"
export PATH="$gnutar/bin:$gcc/bin:$gnumake/bin:$coreutils/bin:$gawk/bin:$gzip/bin:$gnugrep/bin:$gnused/bin:$binutils_unwrapped/bin"
tar -xzf $src
cd hello-2.10
./configure --prefix=$out

View file

@ -3,7 +3,7 @@ derivation {
name = "hello";
builder = "${bash}/bin/bash";
args = [ ./builder.sh ];
buildInputs = [ gnutar gzip gnumake gcc binutils coreutils gawk gnused gnugrep ];
buildInputs = [ gnutar gzip gnumake gcc binutils-unwrapped coreutils gawk gnused gnugrep ];
src = ./hello-2.10.tar.gz;
system = builtins.currentSystem;
}

View file

@ -3,7 +3,7 @@ derivation {
name = "hello";
builder = "${bash}/bin/bash";
args = [ ./hello_builder.sh ];
inherit gnutar gzip gnumake gcc binutils coreutils gawk gnused gnugrep;
inherit gnutar gzip gnumake gcc binutils-unwrapped coreutils gawk gnused gnugrep;
src = ./hello-2.10.tar.gz;
system = builtins.currentSystem;
}