diff --git a/pkgs/desktops/gnome-3/misc/gitg/default.nix b/pkgs/desktops/gnome-3/misc/gitg/default.nix index 5a691b89bc0..cb4c5c05cb0 100644 --- a/pkgs/desktops/gnome-3/misc/gitg/default.nix +++ b/pkgs/desktops/gnome-3/misc/gitg/default.nix @@ -1,22 +1,42 @@ -{ stdenv, fetchurl, fetchpatch, vala, intltool, pkgconfig, gtk3, glib -, json-glib, wrapGAppsHook, libpeas, bash, gobject-introspection -, libsoup, gtksourceview, gsettings-desktop-schemas, adwaita-icon-theme -, gnome3, gtkspell3, shared-mime-info, libgee, libgit2-glib, libsecret -, meson, ninja, python3 - }: +{ stdenv +, fetchurl +, fetchpatch +, vala_0_42 +, intltool +, pkgconfig +, gtk3 +, glib +, json-glib +, wrapGAppsHook +, libpeas +, bash +, gobject-introspection +, libsoup +, gtksourceview +, gsettings-desktop-schemas +, adwaita-icon-theme +, gnome3 +, gtkspell3 +, shared-mime-info +, libgee +, libgit2-glib +, libsecret +, meson +, ninja +, python3 +}: -let +stdenv.mkDerivation rec { pname = "gitg"; version = "3.30.1"; -in stdenv.mkDerivation rec { - name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1fz8q1aiql6k740savdjh0vzbyhcflgf94cfdhvzcrrvm929n2ss"; }; patches = [ + # Fix build with latest libgit2-glib (fetchpatch { url = https://gitlab.gnome.org/GNOME/gitg/commit/42bceea265f53fe7fd4a41037b936deed975fc6c.patch; sha256 = "1xq245rsi1bi66lswk33pdiazfaagxf77836ds5q73900rx4r7fw"; @@ -36,12 +56,30 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; buildInputs = [ - gtk3 glib json-glib libgee libpeas libsoup - libgit2-glib gtkspell3 gtksourceview gsettings-desktop-schemas - libsecret gobject-introspection adwaita-icon-theme + adwaita-icon-theme + glib + gsettings-desktop-schemas + gtk3 + gtksourceview + gtkspell3 + json-glib + libgee + libgit2-glib + libpeas + libsecret + libsoup ]; - nativeBuildInputs = [ meson ninja python3 vala wrapGAppsHook intltool pkgconfig ]; + nativeBuildInputs = [ + gobject-introspection + intltool + meson + ninja + pkgconfig + python3 + vala_0_42 # fails build with 0.44, drop in >3.30.1 + wrapGAppsHook + ]; preFixup = '' gappsWrapperArgs+=( diff --git a/pkgs/development/libraries/vte/ng.nix b/pkgs/development/libraries/vte/ng.nix index 6231b8315cd..c00be4c008f 100644 --- a/pkgs/development/libraries/vte/ng.nix +++ b/pkgs/development/libraries/vte/ng.nix @@ -1,4 +1,4 @@ -{ vte, fetchFromGitHub, autoconf, automake, gtk-doc, gettext, libtool, gperf }: +{ vte, fetchFromGitHub, fetchpatch, autoconf, automake, gtk-doc, gettext, libtool, gperf }: vte.overrideAttrs (oldAttrs: rec { name = "vte-ng-${version}"; @@ -11,6 +11,15 @@ vte.overrideAttrs (oldAttrs: rec { sha256 = "1r7d9m07cpdr4f7rw3yx33hmp4jmsk0dn5byq5wgksb2qjbc4ags"; }; + patches = [ + # Fix build with vala 0.44 + # See: https://github.com/thestinger/vte-ng/issues/32 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/vte/commit/53690d5cee51bdb7c3f7680d3c22b316b1086f2c.patch"; + sha256 = "1jrpqsx5hqa01g7cfqrsns6vz51mwyqwdp43ifcpkhz3wlp5dy66"; + }) + ]; + preConfigure = oldAttrs.preConfigure + "; NOCONFIGURE=1 ./autogen.sh"; nativeBuildInputs = oldAttrs.nativeBuildInputs or []