diff options
| author | worldofpeace <worldofpeace@users.noreply.github.com> | 2019-04-06 17:09:43 -0400 |
|---|---|---|
| committer | worldofpeace <worldofpeace@users.noreply.github.com> | 2019-04-06 17:09:43 -0400 |
| commit | 44a40a02cbb62331c6ac82bc046624f1d1cd6e20 (patch) | |
| tree | c6e51baba8f7921a1a32bb7edcd673249699c181 /pkgs | |
| parent | a2c1f97a11b6df799dbe99be0acbd4a794d1ff58 (diff) | |
| download | nixpkgs-44a40a02cbb62331c6ac82bc046624f1d1cd6e20.tar nixpkgs-44a40a02cbb62331c6ac82bc046624f1d1cd6e20.tar.gz nixpkgs-44a40a02cbb62331c6ac82bc046624f1d1cd6e20.tar.bz2 nixpkgs-44a40a02cbb62331c6ac82bc046624f1d1cd6e20.tar.lz nixpkgs-44a40a02cbb62331c6ac82bc046624f1d1cd6e20.tar.xz nixpkgs-44a40a02cbb62331c6ac82bc046624f1d1cd6e20.tar.zst nixpkgs-44a40a02cbb62331c6ac82bc046624f1d1cd6e20.zip | |
gnome3.gitg: cleanup
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/desktops/gnome-3/misc/gitg/default.nix | 66 |
1 files changed, 52 insertions, 14 deletions
diff --git a/pkgs/desktops/gnome-3/misc/gitg/default.nix b/pkgs/desktops/gnome-3/misc/gitg/default.nix index 5a691b89bc0..803465f62bb 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 +, 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 + wrapGAppsHook + ]; preFixup = '' gappsWrapperArgs+=( |