Updating giv to latest from git (>0.9.25).

We were using a version years old.

I picked the git version instead of the last release because the git version
has fixes not released for almost one year.

+7 -32
-27
pkgs/applications/graphics/giv/build.patch
··· 15 15 16 16 env['SBOX'] = False 17 17 18 - diff --git a/giv/SConstruct b/giv/SConstruct 19 - index 047839a..2c267aa 100644 20 - --- a/giv/SConstruct 21 - +++ b/giv/SConstruct 22 - @@ -3,8 +3,9 @@ 23 - 24 - import sys 25 - import re 26 - +import os 27 - 28 - -env = Environment() 29 - +env = Environment(ENV = os.environ) 30 - 31 - src = ["giv.c", 32 - "giv-backstore.c", 33 - diff --git a/src/plugins/dcmtk/SConstruct.standalone b/src/plugins/dcmtk/SConstruct.standalone 34 - index ffce001..74246f8 100644 35 - --- a/src/plugins/dcmtk/SConstruct.standalone 36 - +++ b/src/plugins/dcmtk/SConstruct.standalone 37 - @@ -1,4 +1,6 @@ 38 - -env = Environment() 39 - +import os 40 - + 41 - +env = Environment(ENV = os.environ) 42 - 43 - variant = "Debug" 44 -
+7 -5
pkgs/applications/graphics/giv/default.nix
··· 1 - { stdenv, fetchurl, gdk_pixbuf, scons, pkgconfig, gtk, glib, 1 + { stdenv, fetchFromGitHub, gdk_pixbuf, scons, pkgconfig, gtk, glib, 2 2 pcre, cfitsio, perl, gob2, vala, libtiff, json_glib }: 3 3 4 4 stdenv.mkDerivation rec { 5 - name = "giv-0.9.22"; 5 + name = "giv-20150811-git"; 6 6 7 - src = fetchurl { 8 - url = "mirror://sourceforge/giv/${name}.tar.gz"; 9 - sha256 = "1q0806b66ajppxbv1i71wx5d3ydc1h3hsz23m6g4g80dhiai7dly"; 7 + src = fetchFromGitHub { 8 + owner = "dov"; 9 + repo = "giv"; 10 + rev = "64648bfbbf10ec4a9adfbc939c96c7d1dbdce57a"; 11 + sha256 = "1sz2n7jbmg3g97bs613xxjpzqbsl5rvpg6v7g3x3ycyd35r8vsfp"; 10 12 }; 11 13 12 14 # It built code to be put in a shared object without -fPIC