From 4dccb224c584194e964b5fbef5fe2cee28c57803 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 26 Aug 2014 00:17:03 +0200 Subject: [PATCH] WIP2 --- pkgs/build-support/setup-hooks/multiple-outputs.sh | 13 +++++++------ pkgs/development/compilers/gcc/4.6/default.nix | 2 +- pkgs/development/compilers/gcc/4.8/default.nix | 4 ++-- pkgs/development/compilers/gcc/4.9/default.nix | 2 +- pkgs/development/libraries/acl/default.nix | 2 +- pkgs/development/libraries/attr/default.nix | 1 + pkgs/development/libraries/gettext/default.nix | 2 +- pkgs/development/libraries/glib/default.nix | 5 ++--- pkgs/development/libraries/openssl/default.nix | 2 +- pkgs/development/libraries/pcre/default.nix | 1 + pkgs/development/tools/misc/texinfo/5.2.nix | 2 +- pkgs/stdenv/common-path.nix | 2 +- pkgs/stdenv/generic/default.nix | 2 +- pkgs/stdenv/linux/default.nix | 2 +- pkgs/tools/compression/gzip/default.nix | 2 +- 15 files changed, 23 insertions(+), 21 deletions(-) diff --git a/pkgs/build-support/setup-hooks/multiple-outputs.sh b/pkgs/build-support/setup-hooks/multiple-outputs.sh index 1589ecd3734..ac83a7cca3d 100644 --- a/pkgs/build-support/setup-hooks/multiple-outputs.sh +++ b/pkgs/build-support/setup-hooks/multiple-outputs.sh @@ -55,6 +55,7 @@ _multioutConfig() { _addRpathPrefix "$outputLib" NIX_NO_SELF_RPATH=1 +# Move documentation into the desired outputs. _multioutDocs() { _moveToOutput share/man "$outputMan" _moveToOutput share/info "$outputInfo" @@ -82,13 +83,13 @@ _moveToOutput() { } _multioutPropagateDev() { - if [ "$outputInclude" != "$outputDev" ]; then - mkdir -p "$outputDev"/nix-support - echo "$outputInclude" >> "$outputDev"/nix-support/propagated-build-inputs + if [ "$outputInclude" != "$propagateIntoOutput" ]; then + mkdir -p "$propagateIntoOutput"/nix-support + echo -n " $outputInclude" >> "$propagateIntoOutput"/nix-support/propagated-native-build-inputs fi - if [ "$outputLib" != "$outputDev" ]; then - mkdir -p "$outputDev"/nix-support - echo "$outputLib" >> "$outputDev"/nix-support/propagated-build-inputs + if [ "$outputLib" != "$propagateIntoOutput" ]; then + mkdir -p "$propagateIntoOutput"/nix-support + echo -n " $outputLib" >> "$propagateIntoOutput"/nix-support/propagated-native-build-inputs fi } diff --git a/pkgs/development/compilers/gcc/4.6/default.nix b/pkgs/development/compilers/gcc/4.6/default.nix index 79aea01e175..5403b7c77a1 100644 --- a/pkgs/development/compilers/gcc/4.6/default.nix +++ b/pkgs/development/compilers/gcc/4.6/default.nix @@ -192,7 +192,7 @@ stdenv.mkDerivation ({ outputs = [ "out" "lib" ]; - setOutputConfigureFlags = false; + setOutputFlags = false; inherit patches enableMultilib; diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix index 7197aa22b1d..e7f28bb4f07 100644 --- a/pkgs/development/compilers/gcc/4.8/default.nix +++ b/pkgs/development/compilers/gcc/4.8/default.nix @@ -216,7 +216,7 @@ stdenv.mkDerivation ({ outputs = [ "out" "lib" ]; - setOutputConfigureFlags = false; + setOutputFlags = false; libc_dev = stdenv.gcc.libc_dev; @@ -372,7 +372,7 @@ stdenv.mkDerivation ({ ) } ${if (stdenv ? glibc && cross == null) - then " --with-native-system-header-dir=${stdenv.glibc}/include" + then " --with-native-system-header-dir=${stdenv.glibc.dev}/include" else ""} ${if langAda then " --enable-libada" else ""} ${if cross == null && stdenv.isi686 then "--with-arch=i686" else ""} diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix index f61e6b4445a..3254071f5ed 100644 --- a/pkgs/development/compilers/gcc/4.9/default.nix +++ b/pkgs/development/compilers/gcc/4.9/default.nix @@ -353,7 +353,7 @@ stdenv.mkDerivation ({ ) } ${if (stdenv ? glibc && cross == null) - then " --with-native-system-header-dir=${stdenv.glibc}/include" + then " --with-native-system-header-dir=${stdenv.glibc.dev}/include" else ""} ${if langAda then " --enable-libada" else ""} ${if cross == null && stdenv.isi686 then "--with-arch=i686" else ""} diff --git a/pkgs/development/libraries/acl/default.nix b/pkgs/development/libraries/acl/default.nix index 4055708907b..70e4ef9b810 100644 --- a/pkgs/development/libraries/acl/default.nix +++ b/pkgs/development/libraries/acl/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { outputs = [ "dev" "out" "bin" "doc" ]; nativeBuildInputs = [ gettext ]; - buildInputs = [ attr ]; + buildInputs = [ stdenv.hookLib.multiout attr ]; # Upstream use C++-style comments in C code. Remove them. # This comment breaks compilation if too strict gcc flags are used. diff --git a/pkgs/development/libraries/attr/default.nix b/pkgs/development/libraries/attr/default.nix index e4e9142b632..25b6ffd56c6 100644 --- a/pkgs/development/libraries/attr/default.nix +++ b/pkgs/development/libraries/attr/default.nix @@ -9,6 +9,7 @@ stdenv.mkDerivation rec { }; outputs = [ "dev" "out" "bin" "doc" ]; + buildInputs = [ stdenv.hookLib.multiout ]; nativeBuildInputs = [ gettext ]; diff --git a/pkgs/development/libraries/gettext/default.nix b/pkgs/development/libraries/gettext/default.nix index 4d400a6ea7d..d181bb67db4 100644 --- a/pkgs/development/libraries/gettext/default.nix +++ b/pkgs/development/libraries/gettext/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation (rec { fi ''; - buildInputs = [ xz ] ++ stdenv.lib.optional (!stdenv.isLinux) libiconv; + buildInputs = [ xz xz.bin ] ++ stdenv.lib.optional (!stdenv.isLinux) libiconv; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index ec43d9f8c4b..55d80e5ccff 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -51,12 +51,11 @@ stdenv.mkDerivation rec { patches = optional stdenv.isDarwin ./darwin-compilation.patch; - outputs = [ "dev" "out" "bin" "doc" ]; - + outputs = [ "dev" "out" "bin" ]; # ToDo: docs? setupHook = ./setup-hook.sh; - buildInputs = [ libelf ] + buildInputs = [ stdenv.hookLib.multiout libelf ] ++ optionals doCheck [ tzdata libxml2 desktop_file_utils shared_mime_info ]; nativeBuildInputs = [ pkgconfig gettext perl python ]; diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index cca5049c0d4..847e4f0ac9d 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation { outputs = [ "dev" "out" "man" "bin" ]; - setOutputConfigureFlags = false; + setOutputFlags = false; # ToDo: strange? buildInputs = stdenv.lib.optional withCryptodev cryptodevHeaders; diff --git a/pkgs/development/libraries/pcre/default.nix b/pkgs/development/libraries/pcre/default.nix index 961a9e7b9ea..ae3f2136704 100644 --- a/pkgs/development/libraries/pcre/default.nix +++ b/pkgs/development/libraries/pcre/default.nix @@ -13,6 +13,7 @@ stdenv.mkDerivation rec { }; outputs = [ "dev" "out" "bin" "doc" "man" ]; + buildInputs = [ stdenv.hookLib.multiout ]; # The compiler on Darwin crashes with an internal error while building the # C++ interface. Disabling optimizations on that platform remedies the diff --git a/pkgs/development/tools/misc/texinfo/5.2.nix b/pkgs/development/tools/misc/texinfo/5.2.nix index dde979f532b..9b7b6139a98 100644 --- a/pkgs/development/tools/misc/texinfo/5.2.nix +++ b/pkgs/development/tools/misc/texinfo/5.2.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses, perl, xz, interactive ? false }: +{ stdenv, fetchurl, xz, ncurses, perl, interactive ? false }: stdenv.mkDerivation rec { name = "texinfo-5.2"; diff --git a/pkgs/stdenv/common-path.nix b/pkgs/stdenv/common-path.nix index cff6fd0a3ee..63c9f14b15c 100644 --- a/pkgs/stdenv/common-path.nix +++ b/pkgs/stdenv/common-path.nix @@ -11,5 +11,5 @@ pkgs.gnumake pkgs.bash pkgs.patch - pkgs.xz + pkgs.xz.bin ] diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index 29f9f49a928..118331feff6 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -209,7 +209,7 @@ let # extra useful hooks, so we do not need to pass them as package arguments hookLib = { - multiout = ../../build-support/setup-hooks/multiple-outputs.sh; + multiout = ../../build-support/setup-hooks/multiple-outputs.sh; #ToDo: propagated-native-build-inputs #ToDo: add also autoreconf = pkgs.autoreconfHook }; } diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index aa76cd67191..a2a97158947 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -230,7 +230,7 @@ rec { gcc = stdenvLinuxBoot3Pkgs.gcc.gcc; name = ""; }; - extraBuildInputs = [ stdenvLinuxBoot2Pkgs.patchelf stdenvLinuxBoot3Pkgs.xz ]; + extraBuildInputs = [ stdenvLinuxBoot2Pkgs.patchelf stdenvLinuxBoot3Pkgs.xz.bin ]; overrides = pkgs: { inherit (stdenvLinuxBoot1Pkgs) perl; inherit (stdenvLinuxBoot3Pkgs) gettext gnum4 gmp; diff --git a/pkgs/tools/compression/gzip/default.nix b/pkgs/tools/compression/gzip/default.nix index b7bf9c59f49..2b051099b39 100644 --- a/pkgs/tools/compression/gzip/default.nix +++ b/pkgs/tools/compression/gzip/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, less }: +{ stdenv, fetchurl }: stdenv.mkDerivation rec { name = "gzip-1.6";