diff options
| author | fricklerhandwerk <fricklerhandwerk@users.noreply.github.com> | 2021-01-23 17:53:29 +0100 |
|---|---|---|
| committer | fricklerhandwerk <valentin@fricklerhandwerk.de> | 2021-04-14 22:59:06 +0200 |
| commit | 76d733bf2c8420ec23efd3d62123ad3b40d7e921 (patch) | |
| tree | ac5d05c4a0fe34e141bcc78054b305da5132c357 /pkgs/applications/networking/p2p | |
| parent | 4973dc73f612a2d4746eda9882225a4a6df00092 (diff) | |
gnunet-gtk: fix build
gnunet: 0.14.0 -> 0.14.1 gnunet-gtk: 0.13.1 -> 0.14.0 (there is no 0.14.1 release) build with correct `gnunet` location. otherwise `gnunet-setup` will not pick up plugins. See: https://git.gnunet.org/gnunet-gtk.git/tree/README?id=5034ca084258d6653b2986b00167c736a9cd93ed#n19 add libsodium to pass configure check for GNUnet util library.
Diffstat (limited to 'pkgs/applications/networking/p2p')
| -rw-r--r-- | pkgs/applications/networking/p2p/gnunet/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/networking/p2p/gnunet/gtk.nix | 10 |
2 files changed, 8 insertions, 6 deletions
diff --git a/pkgs/applications/networking/p2p/gnunet/default.nix b/pkgs/applications/networking/p2p/gnunet/default.nix index af290fc1cc5f7..61ff16429783a 100644 --- a/pkgs/applications/networking/p2p/gnunet/default.nix +++ b/pkgs/applications/networking/p2p/gnunet/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "gnunet"; - version = "0.14.0"; + version = "0.14.1"; src = fetchurl { url = "mirror://gnu/gnunet/${pname}-${version}.tar.gz"; - sha256 = "sha256-2u9gO9Mu0dM1yixcaqOnZcDfGcp69dc5CH5tkl6vRas="; + sha256 = "1hhqv994akymf4s593mc1wpsjy6hccd0zbdim3qmc1y3f32hacja"; }; enableParallelBuilding = true; diff --git a/pkgs/applications/networking/p2p/gnunet/gtk.nix b/pkgs/applications/networking/p2p/gnunet/gtk.nix index 2532671bc25e2..3711d5a3c1ed0 100644 --- a/pkgs/applications/networking/p2p/gnunet/gtk.nix +++ b/pkgs/applications/networking/p2p/gnunet/gtk.nix @@ -5,6 +5,7 @@ , gtk3 , libextractor , libgcrypt +, libsodium , libxml2 , pkg-config , wrapGAppsHook @@ -12,11 +13,11 @@ stdenv.mkDerivation rec { pname = "gnunet-gtk"; - version = "0.13.1"; + version = "0.14.0"; src = fetchurl { url = "mirror://gnu/gnunet/${pname}-${version}.tar.gz"; - sha256 = "1zdzgq16h77w6ybwg3lqjsjr965np6iqvncqvkbj07glqd4wss0j"; + sha256 = "18rc7mb45y17d5nrlpf2p4ixp7ir67gcgjf4hlj4r95ic5zi54wa"; }; nativeBuildInputs= [ @@ -31,15 +32,16 @@ stdenv.mkDerivation rec { gtk3 libextractor libgcrypt + libsodium libxml2 ]; + configureFlags = [ "--with-gnunet=${gnunet}" ]; + patchPhase = "patchShebangs pixmaps/icon-theme-installer"; meta = gnunet.meta // { description = "GNUnet GTK User Interface"; homepage = "https://git.gnunet.org/gnunet-gtk.git"; - # configure: error: compiling gnunet-gtk requires GNUnet core headers - broken = true; }; } |