diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2015-10-05 19:25:49 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2015-10-13 20:18:44 +0200 |
commit | 17a3f6a6fa33de932fcd6e31c7a81db88af794b5 (patch) | |
tree | 50dd263dc709ba14f29087d8177066502c5f8b3c /pkgs/development/libraries | |
parent | ba9b80c7e08953cb63ad0061f33538680ea764db (diff) | |
download | nixlib-17a3f6a6fa33de932fcd6e31c7a81db88af794b5.tar nixlib-17a3f6a6fa33de932fcd6e31c7a81db88af794b5.tar.gz nixlib-17a3f6a6fa33de932fcd6e31c7a81db88af794b5.tar.bz2 nixlib-17a3f6a6fa33de932fcd6e31c7a81db88af794b5.tar.lz nixlib-17a3f6a6fa33de932fcd6e31c7a81db88af794b5.tar.xz nixlib-17a3f6a6fa33de932fcd6e31c7a81db88af794b5.tar.zst nixlib-17a3f6a6fa33de932fcd6e31c7a81db88af794b5.zip |
icu: split into multiple outputs
Diffstat (limited to 'pkgs/development/libraries')
-rw-r--r-- | pkgs/development/libraries/boost/generic.nix | 2 | ||||
-rw-r--r-- | pkgs/development/libraries/icu/default.nix | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index 677652a733b2..1fd78761cd3b 100644 --- a/pkgs/development/libraries/boost/generic.nix +++ b/pkgs/development/libraries/boost/generic.nix @@ -148,7 +148,7 @@ stdenv.mkDerivation { configureScript = "./bootstrap.sh"; configureFlags = commonConfigureFlags ++ [ - "--with-icu=${icu}" + "--with-icu=${icu.dev}" "--with-python=${python.interpreter}" ] ++ optional (toolset != null) "--with-toolset=${toolset}"; diff --git a/pkgs/development/libraries/icu/default.nix b/pkgs/development/libraries/icu/default.nix index 909f4e936a94..2158314438ab 100644 --- a/pkgs/development/libraries/icu/default.nix +++ b/pkgs/development/libraries/icu/default.nix @@ -13,6 +13,9 @@ stdenv.mkDerivation { sha256 = "0ys5f5spizg45qlaa31j2lhgry0jka2gfha527n4ndfxxz5j4sz1"; }; + outputs = [ "dev" "out" ]; + outputBin = "dev"; + makeFlags = stdenv.lib.optionalString stdenv.isDarwin "CXXFLAGS=-headerpad_max_install_names"; @@ -37,6 +40,8 @@ stdenv.mkDerivation { sed -i 's/INSTALL_CMD=.*install/INSTALL_CMD=install/' $out/lib/icu/${version}/pkgdata.inc ''; + postFixup = ''_moveToOutput lib/icu "$dev" ''; + enableParallelBuilding = true; meta = with stdenv.lib; { |