parent
5d90f051b0
commit
e58e0d8ae0
4 changed files with 1 additions and 139 deletions
|
@ -1,81 +0,0 @@
|
|||
diff --git a/Core/Geometry/Transform.cc b/Core/Geometry/Transform.cc
|
||||
index 4f16fdc..0da4679 100644
|
||||
--- a/Core/Geometry/Transform.cc
|
||||
+++ b/Core/Geometry/Transform.cc
|
||||
@@ -28,6 +28,7 @@
|
||||
|
||||
#include <cassert>
|
||||
#include <cstring>
|
||||
+#include <cstdio>
|
||||
|
||||
#include <Core/Util/TypeDescription.h>
|
||||
#include <Core/Geometry/Transform.h>
|
||||
diff --git a/Core/Util/FullFileName.cc b/Core/Util/FullFileName.cc
|
||||
index 7a2cad7..7710e92 100644
|
||||
--- a/Core/Util/FullFileName.cc
|
||||
+++ b/Core/Util/FullFileName.cc
|
||||
@@ -29,6 +29,7 @@
|
||||
|
||||
#include <Core/Util/FullFileName.h>
|
||||
#include <iostream>
|
||||
+#include <cstdio>
|
||||
|
||||
namespace SCIRun {
|
||||
|
||||
diff --git a/Externals/particle-system-mm/src/sizingfield/LFS.cxx b/Externals/particle-system-mm/src/sizingfield/LFS.cxx
|
||||
index d1fa5aa..a5a4358 100644
|
||||
--- a/Externals/particle-system-mm/src/sizingfield/LFS.cxx
|
||||
+++ b/Externals/particle-system-mm/src/sizingfield/LFS.cxx
|
||||
@@ -1,5 +1,6 @@
|
||||
#include <cstdlib>
|
||||
#include <iostream>
|
||||
+#include <cstdio>
|
||||
#include <LFS.h>
|
||||
|
||||
using namespace std;
|
||||
diff --git a/Externals/slivr/Point.cc b/Externals/slivr/Point.cc
|
||||
index d3be03e..ed4e503 100644
|
||||
--- a/Externals/slivr/Point.cc
|
||||
+++ b/Externals/slivr/Point.cc
|
||||
@@ -42,6 +42,7 @@
|
||||
#include <slivr/Point.h>
|
||||
#include <slivr/Vector.h>
|
||||
#include <iostream>
|
||||
+#include <cstdio>
|
||||
|
||||
namespace SLIVR {
|
||||
|
||||
diff --git a/Externals/slivr/Transform.cc b/Externals/slivr/Transform.cc
|
||||
index c0a4430..520179f 100644
|
||||
--- a/Externals/slivr/Transform.cc
|
||||
+++ b/Externals/slivr/Transform.cc
|
||||
@@ -47,6 +47,7 @@
|
||||
#include <math.h>
|
||||
#include <string.h>
|
||||
#include <iostream>
|
||||
+#include <cstdio>
|
||||
|
||||
using namespace SLIVR;
|
||||
using namespace std;
|
||||
diff --git a/Externals/slivr/Vector.cc b/Externals/slivr/Vector.cc
|
||||
index 8370d65..8b04bb9 100644
|
||||
--- a/Externals/slivr/Vector.cc
|
||||
+++ b/Externals/slivr/Vector.cc
|
||||
@@ -43,6 +43,7 @@
|
||||
#include <slivr/Point.h>
|
||||
#include <assert.h>
|
||||
#include <iostream>
|
||||
+#include <cstdio>
|
||||
|
||||
using std::istream;
|
||||
using std::ostream;
|
||||
diff --git a/Externals/vispack/src/image/imagefile.txx b/Externals/vispack/src/image/imagefile.txx
|
||||
index ced2590..13a32b2 100644
|
||||
--- a/Externals/vispack/src/image/imagefile.txx
|
||||
+++ b/Externals/vispack/src/image/imagefile.txx
|
||||
@@ -1,3 +1,5 @@
|
||||
+#include <cstdio>
|
||||
+
|
||||
template <class T>
|
||||
int write_raw(const char* name, const VISImage<T>& im)
|
||||
{
|
|
@ -1,54 +0,0 @@
|
|||
{ fetchurl, stdenv, cmake, wxGTK, itk, libGLU_combined, libXft, libXext, libXi, zlib, libXmu,
|
||||
libuuid }:
|
||||
|
||||
assert (stdenv ? glibc);
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "seg3d-1.12_20090930";
|
||||
src = fetchurl {
|
||||
url = https://www.sci.utah.edu/releases/seg3d_v1.12/Seg3D_1.12_20090930_source.tgz;
|
||||
sha256 = "1wr6rc6v5qjjkmws8yrc03z35h3iydxk1z28p06v1wdnca0y71z8";
|
||||
};
|
||||
|
||||
patches = [ ./cstdio.patch ];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DM_LIBRARY=${stdenv.glibc.out}/lib/libm.so"
|
||||
"-DDL_LIBRARY=${stdenv.glibc.out}/lib/libdl.so"
|
||||
"-DBUILD_UTILS=1"
|
||||
"-DBUILD_SEG3D=1"
|
||||
"-DBUILD_DATAFLOW=0"
|
||||
"-DBUILD_SHARED_LIBS=0"
|
||||
"-DWITH_X11=1"
|
||||
"-DBUILD_BIOMESH3D=1"
|
||||
"-DWITH_TETGEN=1"
|
||||
"-DBUILD_TYPE=Release"
|
||||
"-DWITH_WXWIDGETS=ON"
|
||||
"-DITK_DIR=${itk}/lib/InsightToolkit"
|
||||
"-DGDCM_LIBRARY=${itk}/lib/libitkgdcm.a"
|
||||
];
|
||||
|
||||
|
||||
makeFlags = "VERBOSE=1";
|
||||
|
||||
preBuild = ''
|
||||
export LD_LIBRARY_PATH=`pwd`/lib
|
||||
export NIX_LDFLAGS="$NIX_LDFLAGS -lGLU -lSM -lICE -lX11 -lXext -luuid";
|
||||
'';
|
||||
|
||||
preUnpack = ''
|
||||
set -x
|
||||
sourceRoot=`pwd`/src
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
cp Seg3D $out/bin
|
||||
exit 1
|
||||
'';
|
||||
|
||||
buildInputs = [ cmake wxGTK itk libGLU_combined libXft libXext libXi zlib libXmu libuuid ];
|
||||
|
||||
meta = {
|
||||
broken = true;
|
||||
};
|
||||
}
|
|
@ -343,6 +343,7 @@ mapAliases ({
|
|||
scim = sc-im; # added 2016-01-22
|
||||
scollector = bosun; # added 2018-04-25
|
||||
sdlmame = mame; # added 2019-10-30
|
||||
seg3d = throw "seg3d has been removed from nixpkgs (2019-11-10)";
|
||||
shared_mime_info = shared-mime-info; # added 2018-02-25
|
||||
skrooge2 = skrooge; # added 2017-02-18
|
||||
skype = skypeforlinux; # added 2017-07-27
|
||||
|
|
|
@ -20984,10 +20984,6 @@ in
|
|||
protobuf = protobuf3_1;
|
||||
};
|
||||
|
||||
seg3d = callPackage ../applications/graphics/seg3d {
|
||||
wxGTK = wxGTK28.override { unicode = false; };
|
||||
};
|
||||
|
||||
sent = callPackage ../applications/misc/sent { };
|
||||
|
||||
seq24 = callPackage ../applications/audio/seq24 { };
|
||||
|
|
Loading…
Reference in a new issue