From 33d151066f1e66b6890277f6abf62f8c376fcdfd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 20 Aug 2018 10:19:27 +0100 Subject: [PATCH] fix binutils input in hello-builder fixes #76 --- pills/08/hello-builder.txt | 2 +- pills/08/hello-nix.txt | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pills/08/hello-builder.txt b/pills/08/hello-builder.txt index 44e277f..0699ccb 100644 --- a/pills/08/hello-builder.txt +++ b/pills/08/hello-builder.txt @@ -1,4 +1,4 @@ -export PATH="$gnutar/bin:$gcc/bin:$gnumake/bin:$coreutils/bin:$gawk/bin:$gzip/bin:$gnugrep/bin:$gnused/bin:$binutils_unwrapped/bin" +export PATH="$gnutar/bin:$gcc/bin:$gnumake/bin:$coreutils/bin:$gawk/bin:$gzip/bin:$gnugrep/bin:$gnused/bin:$binutils/bin" tar -xzf $src cd hello-2.10 ./configure --prefix=$out diff --git a/pills/08/hello-nix.txt b/pills/08/hello-nix.txt index 305446a..39f02c2 100644 --- a/pills/08/hello-nix.txt +++ b/pills/08/hello-nix.txt @@ -3,7 +3,8 @@ derivation { name = "hello"; builder = "${bash}/bin/bash"; args = [ ./hello_builder.sh ]; - inherit gnutar gzip gnumake gcc binutils-unwrapped coreutils gawk gnused gnugrep; + inherit gnutar gzip gnumake gcc coreutils gawk gnused gnugrep; + binutils = binutils-unwrapped; src = ./hello-2.10.tar.gz; system = builtins.currentSystem; }