diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-07-01 13:08:09 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-07-01 15:56:08 +0200 |
| commit | 06536251c9c697eba324b18d9df8d0d95938048f (patch) | |
| tree | 16de71c02cfdfef696faf9944c4568c3a725a2b0 /pkgs/development/libraries | |
| parent | 0fd9db3cfbae877dcf7a07886c45197386cfef4d (diff) | |
| download | nixpkgs-06536251c9c697eba324b18d9df8d0d95938048f.tar nixpkgs-06536251c9c697eba324b18d9df8d0d95938048f.tar.gz nixpkgs-06536251c9c697eba324b18d9df8d0d95938048f.tar.bz2 nixpkgs-06536251c9c697eba324b18d9df8d0d95938048f.tar.lz nixpkgs-06536251c9c697eba324b18d9df8d0d95938048f.tar.xz nixpkgs-06536251c9c697eba324b18d9df8d0d95938048f.tar.zst nixpkgs-06536251c9c697eba324b18d9df8d0d95938048f.zip | |
readline: Don't use gcc-apple
Diffstat (limited to 'pkgs/development/libraries')
| -rw-r--r-- | pkgs/development/libraries/readline/no-arch_only.patch | 14 | ||||
| -rw-r--r-- | pkgs/development/libraries/readline/readline6.nix | 4 |
2 files changed, 17 insertions, 1 deletions
diff --git a/pkgs/development/libraries/readline/no-arch_only.patch b/pkgs/development/libraries/readline/no-arch_only.patch new file mode 100644 index 00000000000..b23eab5d9d7 --- /dev/null +++ b/pkgs/development/libraries/readline/no-arch_only.patch @@ -0,0 +1,14 @@ +diff -ru -x '*~' readline-6.2-orig/support/shobj-conf readline-6.2/support/shobj-conf +--- support/shobj-conf 2009-10-28 14:20:21.000000000 +0100 ++++ support/shobj-conf 2014-07-01 13:03:28.000000000 +0200 +@@ -168,8 +168,8 @@ + SHLIB_LIBVERSION='$(SHLIB_MAJOR)$(SHLIB_MINOR).$(SHLIB_LIBSUFF)' + SHLIB_LIBSUFF='dylib' + +- SHOBJ_LDFLAGS='-dynamiclib -dynamic -undefined dynamic_lookup -arch_only `/usr/bin/arch`' +- SHLIB_XLDFLAGS='-dynamiclib -arch_only `/usr/bin/arch` -install_name $(libdir)/$@ -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR) -v' ++ SHOBJ_LDFLAGS='-dynamiclib -dynamic -undefined dynamic_lookup' ++ SHLIB_XLDFLAGS='-dynamiclib -install_name $(libdir)/$@ -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR) -v' + + SHLIB_LIBS='-lncurses' # see if -lcurses works on MacOS X 10.1 + ;; diff --git a/pkgs/development/libraries/readline/readline6.nix b/pkgs/development/libraries/readline/readline6.nix index 0826e6c5f7c..e6b49e413b8 100644 --- a/pkgs/development/libraries/readline/readline6.nix +++ b/pkgs/development/libraries/readline/readline6.nix @@ -12,7 +12,9 @@ stdenv.mkDerivation (rec { patchFlags = "-p0"; patches = - [ ./link-against-ncurses.patch ] + [ ./link-against-ncurses.patch + ./no-arch_only.patch + ] ++ (let patch = nr: sha256: |