mirror of
https://github.com/NixOS/nix-pills
synced 2024-09-19 04:00:13 -04:00
Fix some code samples referring to binutils
This commit is contained in:
parent
e01d2127c2
commit
ce931b9697
|
@ -3,7 +3,7 @@ pkgs: attrs:
|
||||||
let defaultAttrs = {
|
let defaultAttrs = {
|
||||||
builder = "${bash}/bin/bash";
|
builder = "${bash}/bin/bash";
|
||||||
args = [ ./builder.sh ];
|
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 = [];
|
buildInputs = [];
|
||||||
system = builtins.currentSystem;
|
system = builtins.currentSystem;
|
||||||
};
|
};
|
||||||
|
|
|
@ -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
|
tar -xzf $src
|
||||||
cd hello-2.10
|
cd hello-2.10
|
||||||
./configure --prefix=$out
|
./configure --prefix=$out
|
||||||
|
|
|
@ -3,7 +3,7 @@ derivation {
|
||||||
name = "hello";
|
name = "hello";
|
||||||
builder = "${bash}/bin/bash";
|
builder = "${bash}/bin/bash";
|
||||||
args = [ ./builder.sh ];
|
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;
|
src = ./hello-2.10.tar.gz;
|
||||||
system = builtins.currentSystem;
|
system = builtins.currentSystem;
|
||||||
}
|
}
|
||||||
|
|
|
@ -4,7 +4,7 @@ derivation {
|
||||||
builder = "${bash}/bin/bash";
|
builder = "${bash}/bin/bash";
|
||||||
args = [ ./hello_builder.sh ];
|
args = [ ./hello_builder.sh ];
|
||||||
inherit gnutar gzip gnumake gcc coreutils gawk gnused gnugrep;
|
inherit gnutar gzip gnumake gcc coreutils gawk gnused gnugrep;
|
||||||
binutils = binutils-unwrapped;
|
bintools = binutils.bintools;
|
||||||
src = ./hello-2.10.tar.gz;
|
src = ./hello-2.10.tar.gz;
|
||||||
system = builtins.currentSystem;
|
system = builtins.currentSystem;
|
||||||
}
|
}
|
||||||
|
|
|
@ -4,7 +4,7 @@ pkgs: attrs:
|
||||||
builder = "${bash}/bin/bash";
|
builder = "${bash}/bin/bash";
|
||||||
args = [ ./builder.sh ];
|
args = [ ./builder.sh ];
|
||||||
setup = ./setup.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 = [];
|
buildInputs = [];
|
||||||
system = builtins.currentSystem;
|
system = builtins.currentSystem;
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in a new issue