gobby5: 0.5.0 → unstable-2018-04-03

fix build
This commit is contained in:
Jan Tojnar 2018-08-08 03:01:22 +02:00
parent 4ce95e453b
commit 59a2753e9e
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
2 changed files with 13 additions and 19 deletions

View File

@ -1,26 +1,22 @@
{ avahiSupport ? false # build support for Avahi in libinfinity { avahiSupport ? false # build support for Avahi in libinfinity
, gnomeSupport ? false # build support for Gnome(gnome-vfs) , stdenv, fetchurl, fetchFromGitHub, autoconf, automake, pkgconfig, wrapGAppsHook
, stdenv, fetchurl, pkgconfig , gtkmm3, gsasl, gtksourceview3, libxmlxx, libinfinity, intltool, itstool, gnome3 }:
, gtkmm2, gsasl, gtksourceview, libxmlxx, libinfinity, intltool
, gnome_vfs ? null}:
let let
libinf = libinfinity.override { gtkWidgets = true; inherit avahiSupport; }; libinf = libinfinity.override { gtkWidgets = true; inherit avahiSupport; };
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
name = "gobby-unstable-2018-04-03";
name = "gobby-0.5.0"; src = fetchFromGitHub {
src = fetchurl { owner = "gobby";
url = "http://releases.0x539.de/gobby/${name}.tar.gz"; repo = "gobby";
sha256 = "165x0r668ma5blziisvbr8qig3jw9hf7i6w8r7wwvz3wsac3bswc"; rev = "ea4df27c9b6b885434797b0071ce198b23f9f63b";
sha256 = "0q7lq64yn16lxvj4jphs8y9194h0xppj8k7y9x8b276krraak2az";
}; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ autoconf automake pkgconfig intltool itstool gnome3.yelp-tools wrapGAppsHook ];
buildInputs = [ gtkmm2 gsasl gtksourceview libxmlxx libinf intltool ] buildInputs = [ gtkmm3 gsasl gtksourceview3 libxmlxx libinf ];
++ stdenv.lib.optional gnomeSupport gnome_vfs;
preConfigure = "./autogen.sh";
configureFlags = ''
'';
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = http://gobby.0x539.de/; homepage = http://gobby.0x539.de/;

View File

@ -16499,9 +16499,7 @@ with pkgs;
gocr = callPackage ../applications/graphics/gocr { }; gocr = callPackage ../applications/graphics/gocr { };
gobby5 = callPackage ../applications/editors/gobby { gobby5 = callPackage ../applications/editors/gobby { };
inherit (gnome2) gtksourceview;
};
gphoto2 = callPackage ../applications/misc/gphoto2 { }; gphoto2 = callPackage ../applications/misc/gphoto2 { };