diff --git a/pills/10/autotools-nix.txt b/pills/10/autotools-nix.txt index a91e254..25b9c07 100644 --- a/pills/10/autotools-nix.txt +++ b/pills/10/autotools-nix.txt @@ -1,12 +1,12 @@ pkgs: attrs: - with pkgs; let defaultAttrs = { - builder = "${bash}/bin/bash"; + builder = "${pkgs.bash}/bin/bash"; args = [ ./builder.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 = []; system = builtins.currentSystem; }; in -derivation (defaultAttrs // attrs) + derivation (defaultAttrs // attrs) + diff --git a/pills/10/hello-nix.txt b/pills/10/hello-nix.txt index c216fb1..bf60ab6 100644 --- a/pills/10/hello-nix.txt +++ b/pills/10/hello-nix.txt @@ -2,6 +2,6 @@ let pkgs = import {}; mkDerivation = import ./autotools.nix pkgs; in mkDerivation { - name = "hello"; - src = ./hello-2.10.tar.gz; -} + name = "hello"; + src = ./hello-2.12.1.tar.gz; + }