diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2014-09-01 11:33:48 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2014-09-01 11:40:22 +0200 |
| commit | b2887c0b5ea3943a8dd5d99ddba6123428c8bfde (patch) | |
| tree | 8b77b2601b676a9b1ae9331b824a6bb8abc56c56 | |
| parent | acba6b4da25e4b92e2422036104ad2040bef1acd (diff) | |
| download | nixlib-b2887c0b5ea3943a8dd5d99ddba6123428c8bfde.tar nixlib-b2887c0b5ea3943a8dd5d99ddba6123428c8bfde.tar.gz nixlib-b2887c0b5ea3943a8dd5d99ddba6123428c8bfde.tar.bz2 nixlib-b2887c0b5ea3943a8dd5d99ddba6123428c8bfde.tar.lz nixlib-b2887c0b5ea3943a8dd5d99ddba6123428c8bfde.tar.xz nixlib-b2887c0b5ea3943a8dd5d99ddba6123428c8bfde.tar.zst nixlib-b2887c0b5ea3943a8dd5d99ddba6123428c8bfde.zip | |
readline5: recover, as it was still used
Partial revert of 30fef8a3cffbc1. I probably confused that with unused readline62.
| -rw-r--r-- | pkgs/development/libraries/readline/readline5.nix | 15 | ||||
| -rw-r--r-- | pkgs/development/libraries/readline/shobj-darwin.patch | 11 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
3 files changed, 28 insertions, 0 deletions
diff --git a/pkgs/development/libraries/readline/readline5.nix b/pkgs/development/libraries/readline/readline5.nix new file mode 100644 index 000000000000..ad9860d855ef --- /dev/null +++ b/pkgs/development/libraries/readline/readline5.nix @@ -0,0 +1,15 @@ +{ stdenv, fetchurl, ncurses }: + +stdenv.mkDerivation { + name = "readline-5.2"; + + src = fetchurl { + url = mirror://gnu/readline/readline-5.2.tar.gz; + sha256 = "0icz4hqqq8mlkwrpczyaha94kns0am9z0mh3a2913kg2msb8vs0j"; + }; + + propagatedBuildInputs = [ncurses]; + + patches = stdenv.lib.optional stdenv.isDarwin ./shobj-darwin.patch; +} + diff --git a/pkgs/development/libraries/readline/shobj-darwin.patch b/pkgs/development/libraries/readline/shobj-darwin.patch new file mode 100644 index 000000000000..a9199ca3e89a --- /dev/null +++ b/pkgs/development/libraries/readline/shobj-darwin.patch @@ -0,0 +1,11 @@ +--- a/support/shobj-conf.orig 2006-04-11 06:15:43.000000000 -0700 ++++ b/support/shobj-conf 2007-11-08 01:15:43.000000000 -0800 +@@ -171,7 +171,7 @@ + SHLIB_LIBSUFF='dylib' + + case "${host_os}" in +- darwin[78]*) SHOBJ_LDFLAGS='' ++ darwin[789]*) SHOBJ_LDFLAGS='' + SHLIB_XLDFLAGS='-dynamiclib -arch_only `/usr/bin/arch` -install_name $(libdir)/$@ -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR) -v' + ;; + *) SHOBJ_LDFLAGS='-dynamic' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 48a4f8b1ba90..7d89e4b4292a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6104,6 +6104,8 @@ let readline = readline6; readline6 = readline63; + readline5 = callPackage ../development/libraries/readline/readline5.nix { }; + readline62 = callPackage ../development/libraries/readline/readline6.nix { }; readline63 = callPackage ../development/libraries/readline/readline6.3.nix { }; |