Merge pull request #58946 from marzipankaiser/fix/grisbi-update

grisbi: 1.0.4 -> 1.2.1
This commit is contained in:
xeji 2019-04-04 22:46:43 +02:00 committed by GitHub
commit ba01392d91
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions

View File

@ -1,17 +1,17 @@
{ fetchurl, stdenv, gtk, pkgconfig, libofx, intltool, wrapGAppsHook { fetchurl, stdenv, gtk, pkgconfig, libgsf, libofx, intltool, wrapGAppsHook
, hicolor-icon-theme, libsoup, gnome3 }: , hicolor-icon-theme, libsoup, gnome3 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "grisbi-${version}"; name = "grisbi-${version}";
version = "1.0.4"; version = "1.2.1";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/grisbi/${name}.tar.bz2"; url = "mirror://sourceforge/grisbi/${name}.tar.bz2";
sha256 = "1rh2iqvi7lpz5l57vn7qk9azil3y1g65mfbi9hhbx956knh9bpf6"; sha1 = "1159c5491967fa7afd251783013579ffb45b891b";
}; };
nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
buildInputs = [ gtk libofx intltool hicolor-icon-theme libsoup buildInputs = [ gtk libgsf libofx intltool hicolor-icon-theme libsoup
gnome3.adwaita-icon-theme ]; gnome3.adwaita-icon-theme ];
meta = with stdenv.lib; { meta = with stdenv.lib; {

View File

@ -17733,7 +17733,7 @@ in
graphicsmagick-imagemagick-compat = callPackage ../applications/graphics/graphicsmagick/compat.nix { }; graphicsmagick-imagemagick-compat = callPackage ../applications/graphics/graphicsmagick/compat.nix { };
grisbi = callPackage ../applications/office/grisbi { gtk = gtk2; }; grisbi = callPackage ../applications/office/grisbi { gtk = gtk3; };
gtkpod = callPackage ../applications/audio/gtkpod { }; gtkpod = callPackage ../applications/audio/gtkpod { };