diff options
author | davidak <davidak@users.noreply.github.com> | 2021-05-01 22:34:44 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-05-01 22:34:44 +0200 |
commit | 2aa133313dddd73ddf5e0b6f5a1ebb546ee1b2a8 (patch) | |
tree | ad70255bcdad7ce6a7b6ffb34a313c65c080e7ad /pkgs/applications | |
parent | 510fc9cd8f97f6c7fc04f0346089a87b1000f71f (diff) | |
parent | 76d733bf2c8420ec23efd3d62123ad3b40d7e921 (diff) |
Merge pull request #110606 from fricklerhandwerk/patch-2
gnunet: 0.14.0 -> 0.14.1; gnunet-gtk 0.13.1 -> 0.14.0
Diffstat (limited to 'pkgs/applications')
-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; }; } |