mirror of
https://github.com/NixOS/nix-pills
synced 2024-09-19 04:00:13 -04:00
commit
ea8ef428da
|
@ -1,12 +1,12 @@
|
||||||
pkgs: attrs:
|
pkgs: attrs:
|
||||||
with pkgs;
|
|
||||||
let defaultAttrs = {
|
let defaultAttrs = {
|
||||||
builder = "${bash}/bin/bash";
|
builder = "${pkgs.bash}/bin/bash";
|
||||||
args = [ ./builder.sh ];
|
args = [ ./builder.sh ];
|
||||||
setup = ./setup.sh;
|
setup = ./setup.sh;
|
||||||
baseInputs = [ gnutar gzip gnumake gcc coreutils gawk gnused gnugrep binutils.bintools patchelf findutils ];
|
baseInputs = with pkgs; [ gnutar gzip gnumake gcc coreutils gawk gnused gnugrep binutils.bintools patchelf findutils ];
|
||||||
buildInputs = [];
|
buildInputs = [];
|
||||||
system = builtins.currentSystem;
|
system = builtins.currentSystem;
|
||||||
};
|
};
|
||||||
in
|
in
|
||||||
derivation (defaultAttrs // attrs)
|
derivation (defaultAttrs // attrs)
|
||||||
|
|
||||||
|
|
|
@ -2,6 +2,6 @@ let
|
||||||
pkgs = import <nixpkgs> {};
|
pkgs = import <nixpkgs> {};
|
||||||
mkDerivation = import ./autotools.nix pkgs;
|
mkDerivation = import ./autotools.nix pkgs;
|
||||||
in mkDerivation {
|
in mkDerivation {
|
||||||
name = "hello";
|
name = "hello";
|
||||||
src = ./hello-2.10.tar.gz;
|
src = ./hello-2.12.1.tar.gz;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue