diff options
| author | codyopel <codyopel@gmail.com> | 2015-05-09 18:20:02 -0400 |
|---|---|---|
| committer | codyopel <codyopel@gmail.com> | 2015-05-09 18:20:06 -0400 |
| commit | 7a794e17978d110bde3e9dec96e9e5de50e7831b (patch) | |
| tree | 77ba3d4c48024d06cba0e8e2aed2fef42a6b8a78 /pkgs/servers/nosql | |
| parent | 28a9f86061a9651c9ea61fcd430e665f327d0f76 (diff) | |
| download | nixlib-7a794e17978d110bde3e9dec96e9e5de50e7831b.tar nixlib-7a794e17978d110bde3e9dec96e9e5de50e7831b.tar.gz nixlib-7a794e17978d110bde3e9dec96e9e5de50e7831b.tar.bz2 nixlib-7a794e17978d110bde3e9dec96e9e5de50e7831b.tar.lz nixlib-7a794e17978d110bde3e9dec96e9e5de50e7831b.tar.xz nixlib-7a794e17978d110bde3e9dec96e9e5de50e7831b.tar.zst nixlib-7a794e17978d110bde3e9dec96e9e5de50e7831b.zip | |
libsodium: refactor & remove duplicate
Diffstat (limited to 'pkgs/servers/nosql')
| -rw-r--r-- | pkgs/servers/nosql/hyperdex/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/servers/nosql/hyperdex/libmacaroons.nix | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/servers/nosql/hyperdex/default.nix b/pkgs/servers/nosql/hyperdex/default.nix index 7ed3661b87ff..659081281ef0 100644 --- a/pkgs/servers/nosql/hyperdex/default.nix +++ b/pkgs/servers/nosql/hyperdex/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, makeWrapper, unzip, autoconf, automake, libtool, - python, sodium, pkgconfig, popt, glog, xz, json_c, gperf, yacc, + python, libsodium, pkgconfig, popt, glog, xz, json_c, gperf, yacc, flex, pandoc, help2man, autoconf-archive, callPackage }: assert stdenv.isLinux; diff --git a/pkgs/servers/nosql/hyperdex/libmacaroons.nix b/pkgs/servers/nosql/hyperdex/libmacaroons.nix index 2d709c5bbd1d..5d91a82a8ec6 100644 --- a/pkgs/servers/nosql/hyperdex/libmacaroons.nix +++ b/pkgs/servers/nosql/hyperdex/libmacaroons.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, unzip, autoconf, automake, libtool, - pkgconfig, sodium, python }: + pkgconfig, libsodium, python }: stdenv.mkDerivation rec { name = "libmacaroons-${version}"; version = "HEAD"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { url = "https://github.com/rescrv/libmacaroons/archive/6febf3ce6c4c77a46d24b40ed29b03ffbfb175a7.zip"; sha256 = "0b4qgim87398chvc3qhxfqv2l1cyl65rhyknln8lk0gq9y00p1ik"; }; - buildInputs = [ unzip autoconf automake libtool python sodium pkgconfig ]; + buildInputs = [ unzip autoconf automake libtool python libsodium pkgconfig ]; preConfigure = "autoreconf -i"; meta = with stdenv.lib; { |