diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-10-09 10:57:57 +0200 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-10-09 10:57:57 +0200 |
commit | 811de3bfaabc39a7a7d22ba34053cfb1a2c4e219 (patch) | |
tree | 631d4305b76e948baefb54741fe2ea3c4dd9fe8b /pkgs/development/libraries/libedit | |
parent | c34932ef86628b8b30284882d8baaef4c56320dd (diff) | |
parent | a2c7804903cdd41d1905fa954bd2dba5e165e793 (diff) | |
download | nixlib-811de3bfaabc39a7a7d22ba34053cfb1a2c4e219.tar nixlib-811de3bfaabc39a7a7d22ba34053cfb1a2c4e219.tar.gz nixlib-811de3bfaabc39a7a7d22ba34053cfb1a2c4e219.tar.bz2 nixlib-811de3bfaabc39a7a7d22ba34053cfb1a2c4e219.tar.lz nixlib-811de3bfaabc39a7a7d22ba34053cfb1a2c4e219.tar.xz nixlib-811de3bfaabc39a7a7d22ba34053cfb1a2c4e219.tar.zst nixlib-811de3bfaabc39a7a7d22ba34053cfb1a2c4e219.zip |
Merge remote-tracking branch 'origin/staging' into darwin-clang-stdenv
Conflicts: pkgs/tools/security/gnupg/default.nix
Diffstat (limited to 'pkgs/development/libraries/libedit')
-rw-r--r-- | pkgs/development/libraries/libedit/default.nix | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/pkgs/development/libraries/libedit/default.nix b/pkgs/development/libraries/libedit/default.nix index 659f22b9b3b3..f913ab8e4938 100644 --- a/pkgs/development/libraries/libedit/default.nix +++ b/pkgs/development/libraries/libedit/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ncurses, groff }: stdenv.mkDerivation rec { - name = "libedit-20130712-3.1"; + name = "libedit-20140620-3.1"; src = fetchurl { url = "http://www.thrysoee.dk/editline/${name}.tar.gz"; - sha256 = "0dwav34041sariyl00nr106xmn123bnxir4qpn5y47vgssfim6sx"; + sha256 = "1wnapwcpl4yq8p95j898jl0hsr39if28qzm5a7zwkbplihm9nax2"; }; # Have `configure' avoid `/usr/bin/nroff' in non-chroot builds. @@ -15,10 +15,7 @@ stdenv.mkDerivation rec { sed -i ${stdenv.lib.optionalString (stdenv.isDarwin && stdenv.gcc.nativeTools) "''"} s/-lncurses/-lncursesw/g $out/lib/pkgconfig/libedit.pc ''; - # taken from gentoo http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/dev-libs/libedit/files/ - patches = [ ./freebsd.patch ./freebsd_weak_ref.patch ]; - - configureFlags = "--enable-widec"; + configureFlags = [ "--enable-widec" ]; propagatedBuildInputs = [ ncurses ]; |