From 4b1c34cac67b08724511b301db2300888f54410f Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sat, 14 Dec 2019 01:22:20 -0800 Subject: [PATCH] gtk-server: 2.3.1 -> 2.4.5 Also bumped gtk version from gtk2 to gtk3 --- .../interpreters/gtk-server/default.nix | 38 +++++++++++-------- 1 file changed, 22 insertions(+), 16 deletions(-) diff --git a/pkgs/development/interpreters/gtk-server/default.nix b/pkgs/development/interpreters/gtk-server/default.nix index 6f5a5ec0f198..4a8330f2749c 100644 --- a/pkgs/development/interpreters/gtk-server/default.nix +++ b/pkgs/development/interpreters/gtk-server/default.nix @@ -1,28 +1,34 @@ -{ stdenv, fetchurl, libffcall, gtk2, pkgconfig }: +{ stdenv, fetchurl +, glib +, gtk3 +, libffcall +, pkgconfig +, wrapGAppsHook +}: stdenv.mkDerivation rec { - v = "2.3.1"; - name = "gtk-server-${v}"; + pname = "gtk-server"; + version = "2.4.5"; src = fetchurl { - url = "mirror://sourceforge/gtk-server/${name}-sr.tar.gz"; - sha256 = "0z8ng5rhxc7fpsj3d50h25wkgcnxjfy030jm8r9w9m729w2c9hxb"; + url = "https://www.gtk-server.org/stable/gtk-server-${version}.tar.gz"; + sha256 = "0vlx5ibvc7hyc8yipjgvrx1azvmh42i9fv1khg3dvn09nrdkrc7f"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libffcall gtk2 ]; + preConfigure = '' + cd src + ''; - configureOptions = [ "--with-gtk2" ]; + nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; + buildInputs = [ libffcall glib gtk3 ]; - NIX_LDFLAGS = [ - "-ldl" - ]; + configureOptions = [ "--with-gtk3" ]; - meta = { + meta = with stdenv.lib; { description = "gtk-server for interpreted GUI programming"; - homepage = http://www.gtk-server.org/; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = [stdenv.lib.maintainers.tohl]; - platforms = stdenv.lib.platforms.linux; + homepage = "http://www.gtk-server.org/"; + license = licenses.gpl2Plus; + maintainers = [ maintainers.tohl ]; + platforms = platforms.linux; }; }