diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-05-16 15:16:08 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-05-16 15:16:08 -0400 |
| commit | ddbe9191ef1549e7695e5e02e545b1b3db46edb4 (patch) | |
| tree | 90e8f4e8bf5c4410b351229cdc637333bae88024 /pkgs/os-specific/darwin/apple-source-releases/libiconv | |
| parent | 16b6f53910f19b84c5d8c5fb58a8ce958fc8a7d3 (diff) | |
| parent | f3fcf1b0a9b0398620b5fa9b40268ef651aa373e (diff) | |
| download | nixpkgs-ddbe9191ef1549e7695e5e02e545b1b3db46edb4.tar nixpkgs-ddbe9191ef1549e7695e5e02e545b1b3db46edb4.tar.gz nixpkgs-ddbe9191ef1549e7695e5e02e545b1b3db46edb4.tar.bz2 nixpkgs-ddbe9191ef1549e7695e5e02e545b1b3db46edb4.tar.lz nixpkgs-ddbe9191ef1549e7695e5e02e545b1b3db46edb4.tar.xz nixpkgs-ddbe9191ef1549e7695e5e02e545b1b3db46edb4.tar.zst nixpkgs-ddbe9191ef1549e7695e5e02e545b1b3db46edb4.zip | |
Merge remote-tracking branch 'upstream/master' into staging
Keep the dontCheck because the test suite fails, get rid of the LDFLAGS hack because we don't need it!
Diffstat (limited to 'pkgs/os-specific/darwin/apple-source-releases/libiconv')
| -rw-r--r-- | pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix index c67609e9675..984e7095516 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix @@ -3,6 +3,10 @@ appleDerivation { postUnpack = "sourceRoot=$sourceRoot/libiconv"; + preConfigure = stdenv.lib.optionalString stdenv.hostPlatform.isiOS '' + sed -i 's/darwin\*/ios\*/g' configure libcharset/configure + ''; + postInstall = '' mv $out/lib/libiconv.dylib $out/lib/libiconv-nocharset.dylib ${stdenv.cc.bintools.targetPrefix}install_name_tool -id $out/lib/libiconv-nocharset.dylib $out/lib/libiconv-nocharset.dylib |