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

Merge pull request #108 from DanBurton/bintools-fix

Browse source 
Fix some code samples referring to binutils
This commit is contained in:
Artturi 2022-04-17 14:27:28 +03:00 committed by GitHub
parent e0208616ba ce931b9697
commit 47bde1fda3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pills/08/autotools-nix.txt
View file

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

2
pills/08/hello-builder.txt
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:$bintools/bin"
tar -xzf $src
cd hello-2.10
./configure --prefix=$out

2
pills/08/hello-nix-rev-1.txt
View file

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

2
pills/08/hello-nix.txt
View file

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

2
pills/10/autotools-nix.txt
View file

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