diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-07-22 11:24:00 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-07-22 11:24:00 +0200 |
| commit | b9e9e90a02769a5f946ed3ce1ffe7c1662a2914b (patch) | |
| tree | 6dc5fb6754e8e63ac22806c57555c8f76f17b861 /pkgs/development/libraries/readline | |
| parent | 4f7289eec98b19004cb26229cbb1373c624fc4d7 (diff) | |
readline-6.3: Fix build on Mac OS X < 10.9
http://hydra.nixos.org/build/12476331
Diffstat (limited to 'pkgs/development/libraries/readline')
| -rw-r--r-- | pkgs/development/libraries/readline/no-arch_only-6.3.patch | 13 | ||||
| -rw-r--r-- | pkgs/development/libraries/readline/readline6.3.nix | 4 |
2 files changed, 16 insertions, 1 deletions
diff --git a/pkgs/development/libraries/readline/no-arch_only-6.3.patch b/pkgs/development/libraries/readline/no-arch_only-6.3.patch new file mode 100644 index 000000000000..7c46dbad962a --- /dev/null +++ b/pkgs/development/libraries/readline/no-arch_only-6.3.patch @@ -0,0 +1,13 @@ +diff -ru -x '*~' readline-6.3-orig/support/shobj-conf readline-6.3/support/shobj-conf +--- support/shobj-conf 2014-02-24 03:06:29.000000000 +0100 ++++ support/shobj-conf 2014-07-22 11:18:52.000000000 +0200 +@@ -194,9 +194,6 @@ + # Darwin 8 == Mac OS X 10.4; Mac OS X 10.N == Darwin N+4 + *) + case "${host_os}" in +- darwin[89]*|darwin1[012]*) +- SHOBJ_ARCHFLAGS='-arch_only `/usr/bin/arch`' +- ;; + *) # Mac OS X 10.9 (Mavericks) and later + SHOBJ_ARCHFLAGS= + # for 32 and 64bit universal library diff --git a/pkgs/development/libraries/readline/readline6.3.nix b/pkgs/development/libraries/readline/readline6.3.nix index 2f99b9d72183..e3f07b3ddc03 100644 --- a/pkgs/development/libraries/readline/readline6.3.nix +++ b/pkgs/development/libraries/readline/readline6.3.nix @@ -13,7 +13,9 @@ stdenv.mkDerivation (rec { patchFlags = "-p0"; patches = - [ ./link-against-ncurses.patch ]; + [ ./link-against-ncurses.patch + ./no-arch_only-6.3.patch + ]; meta = { description = "GNU Readline, a library for interactive line editing"; |