giv: use recent vala

This commit is contained in:
Jan Tojnar 2017-12-19 05:18:53 +01:00
parent 5a060f2441
commit 0c2d0b5564
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4

View File

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, gdk_pixbuf, scons, pkgconfig, gtk2, glib, { stdenv, fetchFromGitHub, gdk_pixbuf, scons, pkgconfig, gtk2, glib,
pcre, cfitsio, perl, gob2, vala_0_23, libtiff, json_glib }: pcre, cfitsio, perl, gob2, vala, libtiff, json_glib }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "giv-${version}"; name = "giv-${version}";
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
prePatch = '' prePatch = ''
sed -i s,/usr/bin/perl,${perl}/bin/perl, doc/eperl sed -i s,/usr/bin/perl,${perl}/bin/perl, doc/eperl
sed -i s,/usr/local,$out, SConstruct sed -i s,/usr/local,$out, SConstruct
''; '';
patches = [ ./build.patch ]; patches = [ ./build.patch ];
@ -25,15 +25,14 @@ stdenv.mkDerivation rec {
installPhase = "scons install"; installPhase = "scons install";
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ scons pkgconfig vala perl gob2 ];
buildInputs = [ gdk_pixbuf gtk2 glib scons pcre cfitsio perl gob2 vala_0_23 libtiff buildInputs = [ gdk_pixbuf gtk2 glib pcre cfitsio libtiff json_glib ];
json_glib ];
meta = { meta = with stdenv.lib; {
description = "Cross platform image and hierarchical vector viewer based"; description = "Cross platform image and hierarchical vector viewer based";
homepage = http://giv.sourceforge.net/giv/; homepage = http://giv.sourceforge.net/giv/;
license = stdenv.lib.licenses.gpl2Plus; license = licenses.gpl2Plus;
maintainers = with stdenv.lib.maintainers; [viric]; maintainers = with maintainers; [ viric ];
platforms = with stdenv.lib.platforms; linux; platforms = with platforms; linux;
}; };
} }