Merge pull request #2438 from falsifian/gnunet_deps

fix GNUnet missing dependencies

pkgs/applications/networking/p2p/gnunet/default.nix

@@ -1,7 +1,6 @@
-{ stdenv, fetchurl, libextractor, libmicrohttpd, libgcrypt
+{ stdenv, fetchurl, adns, curl, gettext, gmp, gnutls, libextractor
-, zlib, gmp, curl, libtool, adns, sqlite, pkgconfig
+, libgcrypt, libgnurl, libidn, libmicrohttpd, libtool, libunistring
-, libxml2, ncurses, gettext, libunistring, libidn
+, makeWrapper, ncurses, pkgconfig, libxml2, sqlite, zlib }:
-, makeWrapper }:
 
 stdenv.mkDerivation rec {
   name = "gnunet-0.10.1";
@@ -12,9 +11,9 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [
-    libextractor libmicrohttpd libgcrypt gmp curl libtool
+    adns curl gettext gmp gnutls libextractor libgcrypt libgnurl libidn
-    zlib adns sqlite libxml2 ncurses libidn
+    libmicrohttpd libtool libunistring libxml2 makeWrapper ncurses
-    pkgconfig gettext libunistring makeWrapper
+    pkgconfig sqlite zlib
   ];
 
   preConfigure = ''

pkgs/development/libraries/libgnurl/default.nix

@@ -0,0 +1,23 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  version = "7.35.0";
+
+  name = "libgnurl-${version}";
+
+  src = fetchurl {
+    url = "https://gnunet.org/sites/default/files/gnurl-${version}.tar.bz2";
+    sha256 = "0dzj22f5z6ppjj1aq1bml64iwbzzcd8w1qy3bgpk6gnzqslsxknf";
+  };
+
+  preConfigure = ''
+    sed -e 's|/usr/bin|/no-such-path|g' -i.bak configure
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A fork of libcurl used by GNUnet";
+    homepage    = https://gnunet.org/gnurl;
+    maintainers = with maintainers; [ falsifian ];
+    hydraPlatforms = platforms.linux;
+  };
+}

pkgs/top-level/all-packages.nix

@@ -4983,6 +4983,8 @@ let
   libgnome_keyring = callPackage ../development/libraries/libgnome-keyring { };
   libgnome_keyring3 = gnome3.libgnome_keyring;
 
+  libgnurl = callPackage ../development/libraries/libgnurl { };
+
   libseccomp = callPackage ../development/libraries/libseccomp { };
 
   libsecret = callPackage ../development/libraries/libsecret { };