Merge pull request #110606 from fricklerhandwerk/patch-2

gnunet: 0.14.0 -> 0.14.1; gnunet-gtk 0.13.1 -> 0.14.0
This commit is contained in:
davidak 2021-05-01 22:34:44 +02:00 committed by GitHub
commit 2aa133313d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 6 deletions

View file

@ -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;

View file

@ -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;
};
}