3
0
Fork 0
forked from mirrors/nixpkgs

nix: Add editline dependency

Also fix incorrect hash for nixUnstable.
This commit is contained in:
Eelco Dolstra 2019-01-11 15:05:17 +01:00
parent ac97ba25ae
commit c1a13108e2
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE

View file

@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, fetchFromGitHub, fetchpatch, perl, curl, bzip2, sqlite, openssl ? null, xz
, pkgconfig, boehmgc, perlPackages, libsodium, brotli, boost
, pkgconfig, boehmgc, perlPackages, libsodium, brotli, boost, editline
, autoreconfHook, autoconf-archive, bison, flex, libxml2, libxslt, docbook5, docbook_xsl_ns
, busybox-sandbox-shell
, storeDir ? "/nix/store"
@ -30,7 +30,7 @@ let
buildInputs = [ curl openssl sqlite xz bzip2 ]
++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium
++ lib.optionals is20 [ brotli boost ]
++ lib.optionals is20 [ brotli boost editline ]
++ lib.optional withLibseccomp libseccomp
++ lib.optional (withAWS && is20)
((aws-sdk-cpp.override {
@ -166,7 +166,7 @@ in rec {
owner = "NixOS";
repo = "nix";
rev = "85488a93ec3b07210339f2b05aa93e970f9ac3be";
sha256 = "0fkmx7gmgg0yij9kw52fkyvib88hj1jsj90vbpy13ccfwknh1044";
sha256 = "1n5dp7p2lzpnj7f834d25k020v16gnnsm56jz46y87v2x7b69ccm";
};
fromGit = true;
})) // { perl-bindings = perl-bindings {