about summary refs log tree commit diff
path: root/release-common.nix
diff options
context:
space:
mode:
authorEelco Dolstra <edolstra@gmail.com>2018-11-13T19·42+0100
committerEelco Dolstra <edolstra@gmail.com>2018-11-13T19·42+0100
commit6c6bbeb439517a21b2a04b83f073650b41d28be0 (patch)
tree1a7570fce287f3dc5390ec6e68da7c3ea2644a21 /release-common.nix
parenta0ef21262f4d5652bfb65cfacaec01d89c475a93 (diff)
parent2a8bdfd31a1711b19bbf19ee3b1bed15b724c007 (diff)
Merge branch 'feature/editline-pr' of https://github.com/dtzWill/nix
Diffstat (limited to 'release-common.nix')
-rw-r--r--release-common.nix4
1 files changed, 3 insertions, 1 deletions
diff --git a/release-common.nix b/release-common.nix
index 9f584993daa1..f495df1440d6 100644
--- a/release-common.nix
+++ b/release-common.nix
@@ -29,6 +29,8 @@ rec {
     '';
   });
 
+  editline = pkgs.editline or (pkgs.callPackage ./editline.nix {});
+
   configureFlags =
     [
       "--enable-gc"
@@ -49,7 +51,7 @@ rec {
 
   buildDeps =
     [ curl
-      bzip2 xz brotli
+      bzip2 xz brotli editline
       openssl pkgconfig sqlite boehmgc
       boost