diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2014-08-26 00:17:03 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2014-08-26 01:10:56 +0200 |
commit | 4dccb224c584194e964b5fbef5fe2cee28c57803 (patch) | |
tree | e8c1714ebd576bcebcf933477539294d31362b59 /pkgs/development | |
parent | 3ec413ceced044131825c090f29a48768b562797 (diff) |
WIP2
Diffstat (limited to 'pkgs/development')
-rw-r--r-- | pkgs/development/compilers/gcc/4.6/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/compilers/gcc/4.8/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/compilers/gcc/4.9/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/libraries/acl/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/libraries/attr/default.nix | 1 | ||||
-rw-r--r-- | pkgs/development/libraries/gettext/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/libraries/glib/default.nix | 5 | ||||
-rw-r--r-- | pkgs/development/libraries/openssl/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/libraries/pcre/default.nix | 1 | ||||
-rw-r--r-- | pkgs/development/tools/misc/texinfo/5.2.nix | 2 |
10 files changed, 12 insertions, 11 deletions
diff --git a/pkgs/development/compilers/gcc/4.6/default.nix b/pkgs/development/compilers/gcc/4.6/default.nix index 79aea01e17596..5403b7c77a117 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 7197aa22b1d36..e7f28bb4f0730 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 f61e6b4445a0d..3254071f5eded 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 4055708907b9f..70e4ef9b8107e 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 e4e9142b63285..25b6ffd56c659 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 4d400a6ea7dab..d181bb67db4f4 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 ec43d9f8c4bf3..55d80e5ccff8a 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 cca5049c0d430..847e4f0ac9d9b 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 961a9e7b9ea6c..ae3f21367045b 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 dde979f532baf..9b7b6139a983b 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"; |