diff options
| author | danme <daniel@menke-online.com> | 2019-09-13 17:52:15 +0200 |
|---|---|---|
| committer | danme <daniel@menke-online.com> | 2019-09-13 17:52:15 +0200 |
| commit | 55a636055c1023ee054d7a20c3b9a7c85227d01c (patch) | |
| tree | 755bd7ee12776ba2afe79fc5b260845414e48839 | |
| parent | a4bea6db8b428309b1e8d33087b778625fac4dfb (diff) | |
| download | nixlib-55a636055c1023ee054d7a20c3b9a7c85227d01c.tar nixlib-55a636055c1023ee054d7a20c3b9a7c85227d01c.tar.gz nixlib-55a636055c1023ee054d7a20c3b9a7c85227d01c.tar.bz2 nixlib-55a636055c1023ee054d7a20c3b9a7c85227d01c.tar.lz nixlib-55a636055c1023ee054d7a20c3b9a7c85227d01c.tar.xz nixlib-55a636055c1023ee054d7a20c3b9a7c85227d01c.tar.zst nixlib-55a636055c1023ee054d7a20c3b9a7c85227d01c.zip | |
giv: removed
Because of a build error dropped for 19.09 (#68361).
| -rw-r--r-- | pkgs/applications/graphics/giv/build.patch | 22 | ||||
| -rw-r--r-- | pkgs/applications/graphics/giv/default.nix | 34 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
3 files changed, 0 insertions, 58 deletions
diff --git a/pkgs/applications/graphics/giv/build.patch b/pkgs/applications/graphics/giv/build.patch deleted file mode 100644 index f57689fd3fa9..000000000000 --- a/pkgs/applications/graphics/giv/build.patch +++ /dev/null @@ -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] diff --git a/pkgs/applications/graphics/giv/default.nix b/pkgs/applications/graphics/giv/default.nix deleted file mode 100644 index 9ba7dbed37b3..000000000000 --- a/pkgs/applications/graphics/giv/default.nix +++ /dev/null @@ -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; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2e8b13c687e4..7121166cb663 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18432,8 +18432,6 @@ in inherit (gnome3) gitg; - giv = callPackage ../applications/graphics/giv { }; - gmrun = callPackage ../applications/misc/gmrun {}; gnucash = callPackage ../applications/office/gnucash { |