summary refs log tree commit diff
path: root/pkgs/development/libraries/readline/6.2.nix
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2014-09-23 11:27:53 +0200
committerEelco Dolstra <eelco.dolstra@logicblox.com>2014-09-23 11:27:53 +0200
commitcd71f7a2e660440cbcf634ba97eaae310084d11a (patch)
treea40196e3795a4f18ff8fcc9d0f93af0fc1afa3cb /pkgs/development/libraries/readline/6.2.nix
parentc1cf0b7dd5fccb16c8c470d8c766a050fd7a4a36 (diff)
parent25b395bc8d8b1590723dc42edd97561611f8db68 (diff)
downloadnixpkgs-cd71f7a2e660440cbcf634ba97eaae310084d11a.tar
nixpkgs-cd71f7a2e660440cbcf634ba97eaae310084d11a.tar.gz
nixpkgs-cd71f7a2e660440cbcf634ba97eaae310084d11a.tar.bz2
nixpkgs-cd71f7a2e660440cbcf634ba97eaae310084d11a.tar.lz
nixpkgs-cd71f7a2e660440cbcf634ba97eaae310084d11a.tar.xz
nixpkgs-cd71f7a2e660440cbcf634ba97eaae310084d11a.tar.zst
nixpkgs-cd71f7a2e660440cbcf634ba97eaae310084d11a.zip
Merge branch 'darwin-stdenv' of github.com:joelteon/nixpkgs into staging
Conflicts:
	pkgs/development/interpreters/ruby/ruby-19.nix
	pkgs/development/libraries/libc++/default.nix
	pkgs/development/libraries/libc++abi/default.nix
	pkgs/tools/text/sgml/opensp/default.nix
Diffstat (limited to 'pkgs/development/libraries/readline/6.2.nix')
-rw-r--r--pkgs/development/libraries/readline/6.2.nix1
1 files changed, 1 insertions, 0 deletions
diff --git a/pkgs/development/libraries/readline/6.2.nix b/pkgs/development/libraries/readline/6.2.nix
index d72d6566bbc..1555f255c51 100644
--- a/pkgs/development/libraries/readline/6.2.nix
+++ b/pkgs/development/libraries/readline/6.2.nix
@@ -14,6 +14,7 @@ stdenv.mkDerivation (rec {
   patches =
     [ ./link-against-ncurses.patch
       ./no-arch_only.patch
+      ./clang.patch
     ]
     ++
     (let