diff options
author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-04-30 23:42:44 -0400 |
---|---|---|
committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-05-01 22:56:49 -0400 |
commit | 62fd669ab709fbe1b1a7a7a9220c6a42a1c57acd (patch) | |
tree | 1fd8e5878bd99ed2c1eb495af7e18c1c13a741ec | |
parent | 4b3cc9ed87a0c90898950fc1fa94d968acda1bed (diff) | |
download | nixlib-62fd669ab709fbe1b1a7a7a9220c6a42a1c57acd.tar nixlib-62fd669ab709fbe1b1a7a7a9220c6a42a1c57acd.tar.gz nixlib-62fd669ab709fbe1b1a7a7a9220c6a42a1c57acd.tar.bz2 nixlib-62fd669ab709fbe1b1a7a7a9220c6a42a1c57acd.tar.lz nixlib-62fd669ab709fbe1b1a7a7a9220c6a42a1c57acd.tar.xz nixlib-62fd669ab709fbe1b1a7a7a9220c6a42a1c57acd.tar.zst nixlib-62fd669ab709fbe1b1a7a7a9220c6a42a1c57acd.zip |
darwin.libiconv: Start to fix for cross
I think I need postPatch for `autoreconfHook`, it's better anyways, and I'm pairing this with another mass-rebuild so its essentially free.
-rw-r--r-- | pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix | 8 |
1 files changed, 4 insertions, 4 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 d9b3dfb74049..a89f9fdf90ed 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix @@ -1,14 +1,14 @@ -{ stdenv, appleDerivation }: +{ stdenv, appleDerivation, autoreconfHook }: appleDerivation { - preConfigure = "cd libiconv"; + postUnpack = "sourceRoot=$sourceRoot/libiconv"; postInstall = '' mv $out/lib/libiconv.dylib $out/lib/libiconv-nocharset.dylib - install_name_tool -id $out/lib/libiconv-nocharset.dylib $out/lib/libiconv-nocharset.dylib + ${stdenv.cc.bintools.targetPrefix}install_name_tool -id $out/lib/libiconv-nocharset.dylib $out/lib/libiconv-nocharset.dylib # re-export one useless symbol; ld will reject a dylib that only reexports other dylibs - echo 'void dont_use_this(){}' | clang -dynamiclib -x c - -current_version 2.4.0 \ + echo 'void dont_use_this(){}' | ${stdenv.cc.bintools.targetPrefix}clang -dynamiclib -x c - -current_version 2.4.0 \ -compatibility_version 7.0.0 -current_version 7.0.0 -o $out/lib/libiconv.dylib \ -Wl,-reexport_library -Wl,$out/lib/libiconv-nocharset.dylib \ -Wl,-reexport_library -Wl,$out/lib/libcharset.dylib |