diff options
| author | Tor Hedin Brønner <torhedinbronner@gmail.com> | 2018-10-17 10:57:55 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2018-11-30 21:35:22 +0100 |
| commit | abb694f5622731149ad4bea90cb1273134be8bb2 (patch) | |
| tree | 9e9bbc09a7aad05a19c5abfd50260be340ecccec /pkgs/desktops | |
| parent | 3fdfde44c65e246a19cbb2afb86153e5b64dcdb6 (diff) | |
| download | nixlib-abb694f5622731149ad4bea90cb1273134be8bb2.tar nixlib-abb694f5622731149ad4bea90cb1273134be8bb2.tar.gz nixlib-abb694f5622731149ad4bea90cb1273134be8bb2.tar.bz2 nixlib-abb694f5622731149ad4bea90cb1273134be8bb2.tar.lz nixlib-abb694f5622731149ad4bea90cb1273134be8bb2.tar.xz nixlib-abb694f5622731149ad4bea90cb1273134be8bb2.tar.zst nixlib-abb694f5622731149ad4bea90cb1273134be8bb2.zip | |
gitg: 3.26.0 -> 3.30.1
Diffstat (limited to 'pkgs/desktops')
| -rw-r--r-- | pkgs/desktops/gnome-3/misc/gitg/default.nix | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/pkgs/desktops/gnome-3/misc/gitg/default.nix b/pkgs/desktops/gnome-3/misc/gitg/default.nix index c50db12f6b0f..d94d14719c5f 100644 --- a/pkgs/desktops/gnome-3/misc/gitg/default.nix +++ b/pkgs/desktops/gnome-3/misc/gitg/default.nix @@ -1,35 +1,39 @@ { stdenv, fetchurl, vala, intltool, pkgconfig, gtk3, glib , json-glib, wrapGAppsHook, libpeas, bash, gobjectIntrospection , gnome3, gtkspell3, shared-mime-info, libgee, libgit2-glib, libsecret +, meson, ninja, python3 }: let pname = "gitg"; - version = "3.26.0"; + 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"; - sha256 = "26730d437d6a30d6e341b9e8da99d2134dce4b96022c195609f45062f82b54d5"; + sha256 = "1fz8q1aiql6k740savdjh0vzbyhcflgf94cfdhvzcrrvm929n2ss"; }; - preCheck = '' - substituteInPlace tests/libgitg/test-commit.c --replace "/bin/bash" "${bash}/bin/bash" + postPatch = '' + chmod +x meson_post_install.py + patchShebangs meson_post_install.py + sed -i '/gtk-update-icon-cache/s/^/#/' meson_post_install.py + + substituteInPlace tests/libgitg/test-commit.vala --replace "/bin/bash" "${bash}/bin/bash" ''; + doCheck = true; enableParallelBuilding = true; - makeFlags = "INTROSPECTION_GIRDIR=$(out)/share/gir-1.0/ INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0"; - buildInputs = [ gtk3 glib json-glib libgee libpeas gnome3.libsoup libgit2-glib gtkspell3 gnome3.gtksourceview gnome3.gsettings-desktop-schemas libsecret gobjectIntrospection gnome3.adwaita-icon-theme ]; - nativeBuildInputs = [ vala wrapGAppsHook intltool pkgconfig ]; + nativeBuildInputs = [ meson ninja python3 vala wrapGAppsHook intltool pkgconfig ]; preFixup = '' gappsWrapperArgs+=( |