diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2017-09-28 12:32:57 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2017-09-28 12:32:57 -0400 |
| commit | f037625f87b0b1d8852a1f31ebaece5fdbc87a2b (patch) | |
| tree | af8c8369954890db69195a1e9394ce16c7640d7f /pkgs/applications/graphics/giv | |
| parent | f08d6f0e2daf9f3d9daa070eee223855b33c430d (diff) | |
| parent | 4e22e88b914ffb63393449c5e20fe8843a7ce93b (diff) | |
| download | nixlib-f037625f87b0b1d8852a1f31ebaece5fdbc87a2b.tar nixlib-f037625f87b0b1d8852a1f31ebaece5fdbc87a2b.tar.gz nixlib-f037625f87b0b1d8852a1f31ebaece5fdbc87a2b.tar.bz2 nixlib-f037625f87b0b1d8852a1f31ebaece5fdbc87a2b.tar.lz nixlib-f037625f87b0b1d8852a1f31ebaece5fdbc87a2b.tar.xz nixlib-f037625f87b0b1d8852a1f31ebaece5fdbc87a2b.tar.zst nixlib-f037625f87b0b1d8852a1f31ebaece5fdbc87a2b.zip | |
Merge remote-tracking branch 'upstream/staging' into deps-reorg
Diffstat (limited to 'pkgs/applications/graphics/giv')
| -rw-r--r-- | pkgs/applications/graphics/giv/build.patch | 17 | ||||
| -rw-r--r-- | pkgs/applications/graphics/giv/default.nix | 7 |
2 files changed, 15 insertions, 9 deletions
diff --git a/pkgs/applications/graphics/giv/build.patch b/pkgs/applications/graphics/giv/build.patch index ec343c902386..f57689fd3fa9 100644 --- a/pkgs/applications/graphics/giv/build.patch +++ b/pkgs/applications/graphics/giv/build.patch @@ -2,16 +2,21 @@ Get the environment propagated to scons forked childs, and correct the dicom plu a typedef of size_t that failed at least on x86_64-linux. diff --git a/SConstruct b/SConstruct -index 16eccd9..603e931 100644 +index 9e752d6..f93f27f 100644 --- a/SConstruct +++ b/SConstruct -@@ -7,8 +7,7 @@ else: - cppflags = ['-O2'] - variant = 'Release' +@@ -9,13 +9,7 @@ else: + + commit_id = os.popen('git rev-parse HEAD').read().replace('\n','') -env = Environment(LIBPATH=[], -- CPPFLAGS = cppflags) +- 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] diff --git a/pkgs/applications/graphics/giv/default.nix b/pkgs/applications/graphics/giv/default.nix index af57115947e0..92e6084ce673 100644 --- a/pkgs/applications/graphics/giv/default.nix +++ b/pkgs/applications/graphics/giv/default.nix @@ -2,13 +2,14 @@ pcre, cfitsio, perl, gob2, vala_0_23, libtiff, json_glib }: stdenv.mkDerivation rec { - name = "giv-20150811-git"; + name = "giv-${version}"; + version = "0.9.26"; src = fetchFromGitHub { owner = "dov"; repo = "giv"; - rev = "64648bfbbf10ec4a9adfbc939c96c7d1dbdce57a"; - sha256 = "1sz2n7jbmg3g97bs613xxjpzqbsl5rvpg6v7g3x3ycyd35r8vsfp"; + rev = "v${version}"; + sha256 = "1sfm8j3hvqij6z3h8xz724d7hjqqbzljl2a6pp4yjpnnrxksnic2"; }; hardeningDisable = [ "format" ]; |