diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2017-12-19 05:18:53 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2017-12-19 17:25:50 +0100 |
| commit | 0c2d0b5564ff8c28535fdb4ac1d528b9df8d516b (patch) | |
| tree | b4eb154c3a5b5915c575919362c2299fb2cf2882 /pkgs/applications/graphics/giv | |
| parent | 5a060f2441de1cc12c1e05696221e2238909f0d0 (diff) | |
| download | nixlib-0c2d0b5564ff8c28535fdb4ac1d528b9df8d516b.tar nixlib-0c2d0b5564ff8c28535fdb4ac1d528b9df8d516b.tar.gz nixlib-0c2d0b5564ff8c28535fdb4ac1d528b9df8d516b.tar.bz2 nixlib-0c2d0b5564ff8c28535fdb4ac1d528b9df8d516b.tar.lz nixlib-0c2d0b5564ff8c28535fdb4ac1d528b9df8d516b.tar.xz nixlib-0c2d0b5564ff8c28535fdb4ac1d528b9df8d516b.tar.zst nixlib-0c2d0b5564ff8c28535fdb4ac1d528b9df8d516b.zip | |
giv: use recent vala
Diffstat (limited to 'pkgs/applications/graphics/giv')
| -rw-r--r-- | pkgs/applications/graphics/giv/default.nix | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/pkgs/applications/graphics/giv/default.nix b/pkgs/applications/graphics/giv/default.nix index 92e6084ce673..d01286e15a64 100644 --- a/pkgs/applications/graphics/giv/default.nix +++ b/pkgs/applications/graphics/giv/default.nix @@ -1,5 +1,5 @@ { 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 { name = "giv-${version}"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { prePatch = '' 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 ]; @@ -25,15 +25,14 @@ stdenv.mkDerivation rec { installPhase = "scons install"; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gdk_pixbuf gtk2 glib scons pcre cfitsio perl gob2 vala_0_23 libtiff - json_glib ]; + nativeBuildInputs = [ scons pkgconfig vala perl gob2 ]; + buildInputs = [ gdk_pixbuf gtk2 glib pcre cfitsio libtiff json_glib ]; - meta = { + meta = with stdenv.lib; { description = "Cross platform image and hierarchical vector viewer based"; homepage = http://giv.sourceforge.net/giv/; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ viric ]; + platforms = with platforms; linux; }; } |