diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2018-03-22 20:58:36 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2018-03-23 13:18:40 +0100 |
| commit | 359f5b0ff76e26d1c7bf4bb29c9bc3e7088d8425 (patch) | |
| tree | 1d8c0383143687eb05b58732e239204996a1a1c3 /pkgs | |
| parent | efd53598f8d203271179ee1dfda836e48868426b (diff) | |
| download | nixpkgs-359f5b0ff76e26d1c7bf4bb29c9bc3e7088d8425.tar nixpkgs-359f5b0ff76e26d1c7bf4bb29c9bc3e7088d8425.tar.gz nixpkgs-359f5b0ff76e26d1c7bf4bb29c9bc3e7088d8425.tar.bz2 nixpkgs-359f5b0ff76e26d1c7bf4bb29c9bc3e7088d8425.tar.lz nixpkgs-359f5b0ff76e26d1c7bf4bb29c9bc3e7088d8425.tar.xz nixpkgs-359f5b0ff76e26d1c7bf4bb29c9bc3e7088d8425.tar.zst nixpkgs-359f5b0ff76e26d1c7bf4bb29c9bc3e7088d8425.zip | |
gitg: clean up
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/desktops/gnome-3/misc/gitg/default.nix | 40 |
1 files changed, 26 insertions, 14 deletions
diff --git a/pkgs/desktops/gnome-3/misc/gitg/default.nix b/pkgs/desktops/gnome-3/misc/gitg/default.nix index 314539b7f9e..32da3a9a4b8 100644 --- a/pkgs/desktops/gnome-3/misc/gitg/default.nix +++ b/pkgs/desktops/gnome-3/misc/gitg/default.nix @@ -3,37 +3,49 @@ , gnome3, gtkspell3, shared-mime-info, libgee, libgit2-glib, librsvg, libsecret , libsoup }: -stdenv.mkDerivation rec { - name = "gitg-${version}"; +let + pname = "gitg"; version = "3.26.0"; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/gitg/${gnome3.versionBranch version}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; sha256 = "26730d437d6a30d6e341b9e8da99d2134dce4b96022c195609f45062f82b54d5"; }; - passthru = { - updateScript = gnome3.updateScript { packageName = "gitg"; }; - }; - preCheck = '' substituteInPlace tests/libgitg/test-commit.c --replace "/bin/bash" "${bash}/bin/bash" ''; doCheck = true; - makeFlags = "INTROSPECTION_GIRDIR=$(out)/share/gir-1.0/ INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0"; + enableParallelBuilding = true; - propagatedUserEnvPkgs = [ shared-mime-info - gnome3.gnome-themes-standard ]; + 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 - librsvg libsecret gobjectIntrospection gnome3.adwaita-icon-theme ]; + 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 ]; + preFixup = '' + gappsWrapperArgs+=( + # Thumbnailers + --prefix XDG_DATA_DIRS : "${shared-mime-info}/share" + ) + ''; + + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + }; + }; + meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/action/show/Apps/Gitg; + homepage = https://wiki.gnome.org/Apps/Gitg; description = "GNOME GUI client to view git repositories"; maintainers = with maintainers; [ domenkozar ]; license = licenses.gpl2; |