gtk-gnutella: 1.1.14 -> 1.1.15
Remove patches applied between 1.1.14 and 1.1.15 and switch to GitHub source. gtk-gnutella: several changes. Disable internal malloc implementation. Add @doronbehar as maintainer. Comment about hardeningDisable regarding next release. Format arguments and inputs. Enable to disable GUI.
This commit is contained in:
parent
ecfb2b41ce
commit
98f5d0574f
@ -1,37 +1,58 @@
|
|||||||
{ stdenv, fetchurl, fetchpatch, bison, pkgconfig, gettext, desktop-file-utils
|
{ stdenv
|
||||||
, glib, gtk2, libxml2, libbfd, zlib, binutils, gnutls
|
, fetchFromGitHub
|
||||||
|
, fetchpatch
|
||||||
|
, bison
|
||||||
|
, pkgconfig
|
||||||
|
, gettext
|
||||||
|
, desktop-file-utils
|
||||||
|
, glib
|
||||||
|
, gtk2
|
||||||
|
, libxml2
|
||||||
|
, libbfd
|
||||||
|
, zlib
|
||||||
|
, binutils
|
||||||
|
, gnutls
|
||||||
|
, enableGui ? true
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "gtk-gnutella";
|
pname = "gtk-gnutella";
|
||||||
version = "1.1.14";
|
# NOTE: Please remove hardeningDisable on the next release, see:
|
||||||
|
# https://sourceforge.net/p/gtk-gnutella/bugs/555/#5c19
|
||||||
|
version = "1.1.15";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchFromGitHub {
|
||||||
url = "mirror://sourceforge/${pname}/${version}/${pname}-${version}.tar.xz";
|
owner = "gtk-gnutella";
|
||||||
sha256 = "0sljjha4anfz1r1xq1c6qnnkjv62ld56p7xgj4bsi6lqmq1azvii";
|
repo = "gtk-gnutella";
|
||||||
|
rev = "v${version}";
|
||||||
|
sha256 = "1g7w6ywwp2g4qdgmfqkrl1rldk1b4rx50yb7h75hh15mh6nr159r";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
nativeBuildInputs = [
|
||||||
(fetchpatch {
|
bison
|
||||||
# Avoid namespace conflict with glibc 2.28 'statx' struct / remove after v1.1.14
|
desktop-file-utils
|
||||||
url = "https://github.com/gtk-gnutella/gtk-gnutella/commit/e4205a082eb32161e28de81f5cba8095eea8ecc7.patch";
|
gettext
|
||||||
sha256 = "0ffkw2cw2b2yhydii8jm40vd40p4xl224l8jvhimg02lgs3zfbca";
|
pkgconfig
|
||||||
})
|
|
||||||
(fetchpatch {
|
|
||||||
url = "https://src.fedoraproject.org/rpms/gtk-gnutella/raw/f30/f/gtk-gnutella-1.1.14-endian.patch";
|
|
||||||
sha256 = "19q4lq8msknfz4mkbjdqmmgld16p30j2yx371p8spmr19q5i0sfn";
|
|
||||||
})
|
|
||||||
];
|
];
|
||||||
|
buildInputs = [
|
||||||
postPatch = ''
|
glib
|
||||||
substituteInPlace Makefile.SH --replace "@exit 0" "@echo done"
|
gnutls
|
||||||
'';
|
libbfd
|
||||||
|
libxml2
|
||||||
nativeBuildInputs = [ bison desktop-file-utils gettext pkgconfig ];
|
zlib
|
||||||
buildInputs = [ binutils glib gnutls gtk2 libbfd libxml2 zlib ];
|
]
|
||||||
|
++
|
||||||
|
stdenv.lib.optionals (enableGui) [ gtk2 ]
|
||||||
|
;
|
||||||
|
|
||||||
configureScript = "./build.sh";
|
configureScript = "./build.sh";
|
||||||
configureFlags = [ "--configure-only" ];
|
configureFlags = [
|
||||||
|
"--configure-only"
|
||||||
|
# See https://sourceforge.net/p/gtk-gnutella/bugs/555/
|
||||||
|
"--disable-malloc"
|
||||||
|
]
|
||||||
|
++ stdenv.lib.optionals (!enableGui) [ "--topless" ]
|
||||||
|
;
|
||||||
|
|
||||||
hardeningDisable = [ "bindnow" "fortify" "pic" "relro" ];
|
hardeningDisable = [ "bindnow" "fortify" "pic" "relro" ];
|
||||||
|
|
||||||
@ -45,6 +66,7 @@ stdenv.mkDerivation rec {
|
|||||||
description = "A GTK Gnutella client, optimized for speed and scalability";
|
description = "A GTK Gnutella client, optimized for speed and scalability";
|
||||||
homepage = "http://gtk-gnutella.sourceforge.net/"; # Code: https://github.com/gtk-gnutella/gtk-gnutella
|
homepage = "http://gtk-gnutella.sourceforge.net/"; # Code: https://github.com/gtk-gnutella/gtk-gnutella
|
||||||
changelog = "https://raw.githubusercontent.com/gtk-gnutella/gtk-gnutella/v${version}/ChangeLog";
|
changelog = "https://raw.githubusercontent.com/gtk-gnutella/gtk-gnutella/v${version}/ChangeLog";
|
||||||
|
maintainers = [ maintainers.doronbehar ];
|
||||||
license = licenses.gpl2Plus;
|
license = licenses.gpl2Plus;
|
||||||
platforms = platforms.unix;
|
platforms = platforms.unix;
|
||||||
};
|
};
|
||||||
|
Loading…
Reference in New Issue
Block a user