This commit is contained in:
Vladimír Čunát 2014-08-26 00:17:03 +02:00
parent 3ec413cece
commit 4dccb224c5
15 changed files with 23 additions and 21 deletions

View file

@ -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
}

View file

@ -192,7 +192,7 @@ stdenv.mkDerivation ({
outputs = [ "out" "lib" ];
setOutputConfigureFlags = false;
setOutputFlags = false;
inherit patches enableMultilib;

View file

@ -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 ""}

View file

@ -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 ""}

View file

@ -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.

View file

@ -9,6 +9,7 @@ stdenv.mkDerivation rec {
};
outputs = [ "dev" "out" "bin" "doc" ];
buildInputs = [ stdenv.hookLib.multiout ];
nativeBuildInputs = [ gettext ];

View file

@ -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;

View file

@ -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 ];

View file

@ -50,7 +50,7 @@ stdenv.mkDerivation {
outputs = [ "dev" "out" "man" "bin" ];
setOutputConfigureFlags = false;
setOutputFlags = false; # ToDo: strange?
buildInputs = stdenv.lib.optional withCryptodev cryptodevHeaders;

View file

@ -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

View file

@ -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";

View file

@ -11,5 +11,5 @@
pkgs.gnumake
pkgs.bash
pkgs.patch
pkgs.xz
pkgs.xz.bin
]

View file

@ -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
};
}

View file

@ -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;

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, less }:
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "gzip-1.6";