mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-28 09:53:10 +00:00
commit
889485bd7d
@ -1,22 +0,0 @@
|
||||
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 9e752d6..f93f27f 100644
|
||||
--- a/SConstruct
|
||||
+++ b/SConstruct
|
||||
@@ -9,13 +9,7 @@ else:
|
||||
|
||||
commit_id = os.popen('git rev-parse HEAD').read().replace('\n','')
|
||||
|
||||
-env = Environment(LIBPATH=[],
|
||||
- CPPFLAGS = cppflags + ['-Wno-deprecated-declarations',
|
||||
- '-Wno-reorder',
|
||||
- '-Wno-unused-but-set-variable',
|
||||
- '-Wno-unused-function'],
|
||||
- CXXFLAGS=['-std=c++1y']
|
||||
- )
|
||||
+env = Environment(ENV = os.environ)
|
||||
|
||||
env['SBOX'] = False
|
||||
env['COMMITIDSHORT'] = commit_id[0:6]
|
@ -1,34 +0,0 @@
|
||||
{ stdenv, fetchFromGitHub, gdk-pixbuf, scons, pkgconfig, gtk2, glib
|
||||
, pcre, cfitsio, perl, gob2, vala, libtiff, json-glib }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "giv";
|
||||
version = "0.9.26";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dov";
|
||||
repo = "giv";
|
||||
rev = "v${version}";
|
||||
sha256 = "1sfm8j3hvqij6z3h8xz724d7hjqqbzljl2a6pp4yjpnnrxksnic2";
|
||||
};
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
prePatch = ''
|
||||
sed -i s,/usr/bin/perl,${perl}/bin/perl, doc/eperl
|
||||
sed -i s,/usr/local,$out, SConstruct
|
||||
'';
|
||||
|
||||
patches = [ ./build.patch ];
|
||||
|
||||
nativeBuildInputs = [ scons pkgconfig vala perl gob2 ];
|
||||
buildInputs = [ gdk-pixbuf gtk2 glib pcre cfitsio libtiff json-glib ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Cross platform image and hierarchical vector viewer based";
|
||||
homepage = http://giv.sourceforge.net/giv/;
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ ];
|
||||
platforms = with platforms; linux;
|
||||
};
|
||||
}
|
@ -18430,8 +18430,6 @@ in
|
||||
|
||||
inherit (gnome3) gitg;
|
||||
|
||||
giv = callPackage ../applications/graphics/giv { };
|
||||
|
||||
gmrun = callPackage ../applications/misc/gmrun {};
|
||||
|
||||
gnucash = callPackage ../applications/office/gnucash {
|
||||
|
Loading…
Reference in New Issue
Block a user