summary refs log tree commit diff
path: root/pkgs/applications/graphics/giv
diff options
context:
space:
mode:
authorLluís Batlle i Rossell <viric@vicerveza.homeunix.net>2011-04-06 10:00:48 +0000
committerLluís Batlle i Rossell <viric@vicerveza.homeunix.net>2011-04-06 10:00:48 +0000
commit6cfba00e1b39886249939977cb26690494bca076 (patch)
tree8fb5a4b30431ae9eb4486d4c6e2618b1e4ae6bea /pkgs/applications/graphics/giv
parente15ce3340419ac2b0df49570c572036dcab606bf (diff)
downloadnixpkgs-6cfba00e1b39886249939977cb26690494bca076.tar
nixpkgs-6cfba00e1b39886249939977cb26690494bca076.tar.gz
nixpkgs-6cfba00e1b39886249939977cb26690494bca076.tar.bz2
nixpkgs-6cfba00e1b39886249939977cb26690494bca076.tar.lz
nixpkgs-6cfba00e1b39886249939977cb26690494bca076.tar.xz
nixpkgs-6cfba00e1b39886249939977cb26690494bca076.tar.zst
nixpkgs-6cfba00e1b39886249939977cb26690494bca076.zip
Adding giv.
svn path=/nixpkgs/trunk/; revision=26709
Diffstat (limited to 'pkgs/applications/graphics/giv')
-rw-r--r--pkgs/applications/graphics/giv/build.patch56
-rw-r--r--pkgs/applications/graphics/giv/default.nix35
2 files changed, 91 insertions, 0 deletions
diff --git a/pkgs/applications/graphics/giv/build.patch b/pkgs/applications/graphics/giv/build.patch
new file mode 100644
index 00000000000..ed47675296c
--- /dev/null
+++ b/pkgs/applications/graphics/giv/build.patch
@@ -0,0 +1,56 @@
+Get the environment propagated to scons forked childs, and correct the dicom plugin about
+a typedef of size_t that failed at least on x86_64-linux.
+
+diff --git a/SConstruct b/SConstruct
+index 16eccd9..603e931 100644
+--- a/SConstruct
++++ b/SConstruct
+@@ -7,8 +7,7 @@ else:
+     cppflags = ['-O2']
+     variant = 'Release'
+ 
+-env = Environment(LIBPATH=[],
+-                  CPPFLAGS = cppflags)
++env = Environment(ENV = os.environ)
+ 
+ env['SBOX'] = False
+ 
+diff --git a/giv/SConstruct b/giv/SConstruct
+index 047839a..2c267aa 100644
+--- a/giv/SConstruct
++++ b/giv/SConstruct
+@@ -3,8 +3,9 @@
+ 
+ import sys
+ import re
++import os
+ 
+-env = Environment()
++env = Environment(ENV = os.environ)
+ 
+ src = ["giv.c",
+        "giv-backstore.c",
+diff --git a/src/plugins/dcmtk/SConstruct.standalone b/src/plugins/dcmtk/SConstruct.standalone
+index ffce001..74246f8 100644
+--- a/src/plugins/dcmtk/SConstruct.standalone
++++ b/src/plugins/dcmtk/SConstruct.standalone
+@@ -1,4 +1,6 @@
+-env = Environment()
++import os
++
++env = Environment(ENV = os.environ)
+ 
+ variant = "Debug"
+ 
+diff --git a/src/plugins/dcmtk/config/include/dcmtk/config/cfunix.h b/src/plugins/dcmtk/config/include/dcmtk/config/cfunix.h
+index 32dbcbb..c456604 100644
+--- a/src/plugins/dcmtk/config/include/dcmtk/config/cfunix.h
++++ b/src/plugins/dcmtk/config/include/dcmtk/config/cfunix.h
+@@ -332,7 +332,6 @@ typedef int pid_t;
+ #endif
+ 
+ /* Define `size_t' to `unsigned' if <sys/types.h> does not define. */
+-#define HAVE_NO_TYPEDEF_SIZE_T 1
+ #ifdef HAVE_NO_TYPEDEF_SIZE_T
+ typedef unsigned size_t;
+ #endif
diff --git a/pkgs/applications/graphics/giv/default.nix b/pkgs/applications/graphics/giv/default.nix
new file mode 100644
index 00000000000..c4c8afe4af0
--- /dev/null
+++ b/pkgs/applications/graphics/giv/default.nix
@@ -0,0 +1,35 @@
+{ stdenv, fetchurl, gdk_pixbuf, scons, pkgconfig, gtk, glib,
+  pcre, cfitsio, perl, gob2, vala, libtiff }:
+
+stdenv.mkDerivation rec {
+  name = "giv-0.9.18";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/giv/${name}.tar.gz";
+    sha256 = "0w81cc56mq8qiv36jljgarycly3fnpr5i7cjnsprgfm79icdi8nl";
+  };
+
+  # It built code to be put in a shared object without -fPIC
+  NIX_CFLAGS_COMPILE = "-fPIC";
+
+  prePatch = ''
+    sed -i s,/usr/bin/perl,${perl}/bin/perl, doc/eperl
+    sed -i s,/usr/local,$out, SConstruct 
+  '';
+
+  patches = [ /tmp/patch ];
+
+  buildPhase = "scons";
+
+  installPhase = "scons install";
+
+  buildInputs = [ gdk_pixbuf pkgconfig gtk glib scons pcre cfitsio perl gob2 vala libtiff ];
+
+  meta = {
+    description = "Cross platform image and hierarchical vector viewer based";
+    homepage = http://giv.sourceforge.net/giv/;
+    license = "GPLv2+";
+    maintainers = with stdenv.lib.maintainers; [viric];
+    platforms = with stdenv.lib.platforms; linux;
+  };
+}