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

Merge pull request #216 from henrik-ch/pill10

Pill10
This commit is contained in:
proofconstruction 2023-07-10 12:23:35 -05:00 committed by GitHub
commit ea8ef428da
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 7 deletions

View file

@ -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)

View file

@ -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;
} }