diff options
Diffstat (limited to 'pkgs/tools/graphics')
-rw-r--r-- | pkgs/tools/graphics/structure-synth/default.nix | 46 | ||||
-rw-r--r-- | pkgs/tools/graphics/structure-synth/gcc47.patch | 50 |
2 files changed, 0 insertions, 96 deletions
diff --git a/pkgs/tools/graphics/structure-synth/default.nix b/pkgs/tools/graphics/structure-synth/default.nix deleted file mode 100644 index e61489fadf0..00000000000 --- a/pkgs/tools/graphics/structure-synth/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ lib, stdenv, fetchurl, qt4, qmake4Hook, unzip, libGLU, makeWrapper }: - -stdenv.mkDerivation rec { - pname = "structure-synth"; - version = "1.5.0"; - - src = fetchurl { - url = "mirror://sourceforge/structuresynth/StructureSynth-Source-v${version}.zip"; - sha256 = "1kiammx46719az6jzrav8yrwz82nk4m72ybj0kpbnvp9wfl3swbb"; - }; - - buildInputs = [ qt4 libGLU ]; - nativeBuildInputs = [ qmake4Hook makeWrapper unzip ]; - - # Thanks to https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=672000#15: - patches = [ ./gcc47.patch ]; - - enableParallelBuilding = true; - - preConfigure = '' - ${qt4}/bin/qmake -project -after "CONFIG+=opengl" -after "QT+=xml opengl script" -after "unix:LIBS+=-lGLU" - ''; - - installPhase = '' - mkdir -p $out/bin; - mkdir -p $out/share/Examples $out/share/Misc; - cp "Structure Synth Source Code" $out/bin/structure-synth; - cp -r Examples/* $out/share/Examples; - cp -r Misc/* $out/share/Misc; - ''; - - # Structure Synth expects to see 'Examples' and 'Misc' directory in - # either $HOME or $PWD - so help it along by moving $PWD to 'share', - # where we just copied those two directories: - preFixup = '' - wrapProgram "$out/bin/structure-synth" --chdir "$out/share" - ''; - - meta = with lib; { - description = "Application for generating 3D structures by specifying a design grammar"; - homepage = "https://structuresynth.sourceforge.net"; - maintainers = with maintainers; [ hodapp ]; - license = licenses.gpl3; - platforms = platforms.linux; - }; -} diff --git a/pkgs/tools/graphics/structure-synth/gcc47.patch b/pkgs/tools/graphics/structure-synth/gcc47.patch deleted file mode 100644 index 8726e89c830..00000000000 --- a/pkgs/tools/graphics/structure-synth/gcc47.patch +++ /dev/null @@ -1,50 +0,0 @@ -diff -rc "Structure Synth Source Code/SyntopiaCore/GLEngine/Raytracer/RayTracer.cpp" "Structure Synth Source Code2/SyntopiaCore/GLEngine/Raytracer/RayTracer.cpp" -*** "Structure Synth Source Code/SyntopiaCore/GLEngine/Raytracer/RayTracer.cpp" 2010-11-13 22:32:44.000000000 -0500 ---- "Structure Synth Source Code2/SyntopiaCore/GLEngine/Raytracer/RayTracer.cpp" 2018-06-24 14:23:30.794296776 -0400 -*************** -*** 1,5 **** - #include <QThread> -! - - #include "RayTracer.h" - ---- 1,5 ---- - #include <QThread> -! #include <GL/glu.h> - - #include "RayTracer.h" - -diff -rc "Structure Synth Source Code/SyntopiaCore/GLEngine/Raytracer/VoxelStepper.cpp" "Structure Synth Source Code2/SyntopiaCore/GLEngine/Raytracer/VoxelStepper.cpp" -*** "Structure Synth Source Code/SyntopiaCore/GLEngine/Raytracer/VoxelStepper.cpp" 2010-09-08 21:25:30.000000000 -0400 ---- "Structure Synth Source Code2/SyntopiaCore/GLEngine/Raytracer/VoxelStepper.cpp" 2018-06-24 14:23:12.542868194 -0400 -*************** -*** 122,128 **** - currentT = p; - - // We do not intersect grid. -! if (!found) return false; - } - - stepX = (dir.x() > 0) ? 1 : -1; ---- 122,128 ---- - currentT = p; - - // We do not intersect grid. -! if (!found) return NULL; - } - - stepX = (dir.x() > 0) ? 1 : -1; -Only in Structure Synth Source Code2/SyntopiaCore/GLEngine/Raytracer: VoxelStepper.cpp.orig -diff -rc "Structure Synth Source Code/SyntopiaCore/GLEngine/Sphere.h" "Structure Synth Source Code2/SyntopiaCore/GLEngine/Sphere.h" -*** "Structure Synth Source Code/SyntopiaCore/GLEngine/Sphere.h" 2010-08-11 15:12:22.000000000 -0400 ---- "Structure Synth Source Code2/SyntopiaCore/GLEngine/Sphere.h" 2018-06-24 14:23:30.793296807 -0400 -*************** -*** 2,7 **** ---- 2,8 ---- - - #include "SyntopiaCore/Math/Vector3.h" - #include "Object3D.h" -+ #include <GL/glu.h> - - namespace SyntopiaCore { - namespace GLEngine { |