alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

fix .xz in stdenv bootstrap

Browse source 
Presumably needed due to the last staging merge.
There was some stdenv stage refactoring within, IIRC.
This commit is contained in:
Vladimír Čunát 2014-08-30 15:48:17 +02:00
parent 2f92199183
commit 030af0a803
5 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/tools/compression/gzip/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl }: { stdenv, fetchurl, xz }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gzip-1.6"; name = "gzip-1.6";
@ -10,6 +10,8 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true; enableParallelBuilding = true;
buildInputs = [ xz.bin ];
# In stdenv-linux, prevent a dependency on bootstrap-tools. # In stdenv-linux, prevent a dependency on bootstrap-tools.
makeFlags = "SHELL=/bin/sh GREP=grep"; makeFlags = "SHELL=/bin/sh GREP=grep";

4
pkgs/tools/misc/coreutils/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, perl, gmp ? null { stdenv, fetchurl, perl, xz, gmp ? null
, aclSupport ? false, acl ? null , aclSupport ? false, acl ? null
, selinuxSupport? false, libselinux ? null, libsepol ? null , selinuxSupport? false, libselinux ? null, libsepol ? null
}: }:
@ -22,7 +22,7 @@ let
outputs = [ "out" "info" ]; outputs = [ "out" "info" ];
nativeBuildInputs = [ perl ]; nativeBuildInputs = [ perl xz.bin ];
buildInputs = [ gmp ] buildInputs = [ gmp ]
++ optional aclSupport acl ++ optional aclSupport acl
++ optionals selinuxSupport [ libselinux libsepol ]; ++ optionals selinuxSupport [ libselinux libsepol ];

4
pkgs/tools/text/diffutils/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, coreutils ? null }: { stdenv, fetchurl, xz, coreutils ? null }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "diffutils-3.3"; name = "diffutils-3.3";
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
outputs = [ "out" "info" ]; outputs = [ "out" "info" ];
/* If no explicit coreutils is given, use the one from stdenv. */ /* If no explicit coreutils is given, use the one from stdenv. */
nativeBuildInputs = [ coreutils ]; nativeBuildInputs = [ xz.bin coreutils ];
meta = { meta = {
homepage = http://www.gnu.org/software/diffutils/diffutils.html; homepage = http://www.gnu.org/software/diffutils/diffutils.html;

6
pkgs/tools/text/gawk/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, libsigsegv, readline, interactive ? false }: { stdenv, fetchurl, xz, libsigsegv, readline, interactive ? false }:
let let
inherit (stdenv.lib) optional; inherit (stdenv.lib) optional;
@ -12,9 +12,9 @@ stdenv.mkDerivation rec {
}; };
# When we do build separate interactive version, it makes sense to always include docs. # When we do build separate interactive version, it makes sense to always include docs.
#outputs = stdenv.lib.optionals (!interactive) [ "out" "doc" ]; #ToDo outputs = stdenv.lib.optionals (!interactive) [ "out" "doc" ]; #ToDo
buildInputs = [ libsigsegv ] buildInputs = [ xz.bin libsigsegv ]
++ optional interactive readline; ++ optional interactive readline;
configureFlags = [ "--with-libsigsegv-prefix=${libsigsegv}" ] configureFlags = [ "--with-libsigsegv-prefix=${libsigsegv}" ]

4
pkgs/tools/text/gnugrep/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pcre, libiconv ? null }: { stdenv, fetchurl, xz, pcre, libiconv ? null }:
let version = "2.14"; in let version = "2.14"; in
@ -12,7 +12,7 @@ stdenv.mkDerivation {
#outputs = [ "out" "doc" ]; ToDo #outputs = [ "out" "doc" ]; ToDo
buildInputs = [ pcre ] buildInputs = [ pcre xz.bin ]
++ stdenv.lib.optional (libiconv != null) libiconv; ++ stdenv.lib.optional (libiconv != null) libiconv;
patches = [ ./test-localeconv.patch ]; patches = [ ./test-localeconv.patch ];