colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bootstrap tools test: fixup after d71833ee36

Browse Source
This commit is contained in:
Vladimír Čunát 2017-11-11 21:40:21 +01:00
parent 462b5e0d21
commit f6655ba128
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/applications/misc/hello/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchipfs }: { stdenv, fetchipfs, fetchurl }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "hello-2.10"; name = "hello-2.10";
@ -22,4 +22,9 @@ stdenv.mkDerivation rec {
maintainers = [ stdenv.lib.maintainers.eelco ]; maintainers = [ stdenv.lib.maintainers.eelco ];
platforms = stdenv.lib.platforms.all; platforms = stdenv.lib.platforms.all;
}; };
passthru.srcTarball = fetchurl {
inherit (src) url;
sha256 = "0ssi1wpaf7plaswqqjwigppsg5fyh99vdlb9kzl7c9lng89ndq1i";
};
} }

2
pkgs/stdenv/linux/make-bootstrap-tools.nix
View File

@ -216,7 +216,7 @@ rec {
$CXX -v -o $out/bin/bar bar.cc $CXX -v -o $out/bin/bar bar.cc
$out/bin/bar $out/bin/bar
tar xvf ${hello.src} tar xvf ${hello.srcTarball}
cd hello-* cd hello-*
./configure --prefix=$out ./configure --prefix=$out
make make