diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2014-01-18 14:35:07 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2014-01-18 14:46:20 +0100 |
| commit | 0a58b512cb696b2482cbac4fd3a20b43ae31c1bc (patch) | |
| tree | 7ae35a255ac57b66696c3db743f6ed9a4dab7431 /pkgs/development/libraries/icu | |
| parent | 284833649192072959a335367374fc0a6ec667df (diff) | |
| parent | 9c1d3bfa9f7d7b95eb20d0f729e3b3c9d7abcd4b (diff) | |
| download | nixpkgs-0a58b512cb696b2482cbac4fd3a20b43ae31c1bc.tar nixpkgs-0a58b512cb696b2482cbac4fd3a20b43ae31c1bc.tar.gz nixpkgs-0a58b512cb696b2482cbac4fd3a20b43ae31c1bc.tar.bz2 nixpkgs-0a58b512cb696b2482cbac4fd3a20b43ae31c1bc.tar.lz nixpkgs-0a58b512cb696b2482cbac4fd3a20b43ae31c1bc.tar.xz nixpkgs-0a58b512cb696b2482cbac4fd3a20b43ae31c1bc.tar.zst nixpkgs-0a58b512cb696b2482cbac4fd3a20b43ae31c1bc.zip | |
Merge master into stdenv-updates
Conflicts (simple): pkgs/development/compilers/gcc/4.8/default.nix pkgs/development/compilers/llvm/default.nix pkgs/development/libraries/gmp/5.1.1.nix pkgs/development/libraries/gmp/5.1.3.nix pkgs/development/libraries/gmp/5.1.x.nix pkgs/top-level/all-packages.nix
Diffstat (limited to 'pkgs/development/libraries/icu')
| -rw-r--r-- | pkgs/development/libraries/icu/default.nix | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/pkgs/development/libraries/icu/default.nix b/pkgs/development/libraries/icu/default.nix index 2ab163d4b33..fa486ba0b39 100644 --- a/pkgs/development/libraries/icu/default.nix +++ b/pkgs/development/libraries/icu/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{ stdenv, fetchurl, fixDarwinDylibNames }: let @@ -14,6 +14,10 @@ stdenv.mkDerivation { sha256 = "14l0kl17nirc34frcybzg0snknaks23abhdxkmsqg3k9sil5wk9g"; }; + # FIXME: This fixes dylib references in the dylibs themselves, but + # not in the programs in $out/bin. + buildInputs = stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; + postUnpack = '' sourceRoot=''${sourceRoot}/source echo Source root reset to ''${sourceRoot} |