summary refs log tree commit diff
path: root/pkgs/applications/graphics/rapcad
diff options
context:
space:
mode:
authorThomas Tuegel <ttuegel@mailbox.org>2017-03-25 09:23:52 -0500
committerThomas Tuegel <ttuegel@mailbox.org>2017-03-25 09:23:52 -0500
commite6dc95697a3cf633e6d700e19470b19e61150715 (patch)
treea98f6073056b2d0c4d1917c698cb74608776575f /pkgs/applications/graphics/rapcad
parentbb99babc5a1c62edd012da5a1ad14cd3fe1abf0a (diff)
downloadnixpkgs-e6dc95697a3cf633e6d700e19470b19e61150715.tar
nixpkgs-e6dc95697a3cf633e6d700e19470b19e61150715.tar.gz
nixpkgs-e6dc95697a3cf633e6d700e19470b19e61150715.tar.bz2
nixpkgs-e6dc95697a3cf633e6d700e19470b19e61150715.tar.lz
nixpkgs-e6dc95697a3cf633e6d700e19470b19e61150715.tar.xz
nixpkgs-e6dc95697a3cf633e6d700e19470b19e61150715.tar.zst
nixpkgs-e6dc95697a3cf633e6d700e19470b19e61150715.zip
rapcad: pin to Qt 5.6
Diffstat (limited to 'pkgs/applications/graphics/rapcad')
-rw-r--r--pkgs/applications/graphics/rapcad/default.nix11
1 files changed, 9 insertions, 2 deletions
diff --git a/pkgs/applications/graphics/rapcad/default.nix b/pkgs/applications/graphics/rapcad/default.nix
index 16c9e9fdff2..b7672a39d0d 100644
--- a/pkgs/applications/graphics/rapcad/default.nix
+++ b/pkgs/applications/graphics/rapcad/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cgal, boost, gmp, mpfr, flex, bison, dxflib, readline
+{ stdenv, fetchFromGitHub, fetchurl, cgal, boost, gmp, mpfr, flex, bison, dxflib, readline
 , qtbase, qmakeHook, mesa_glu
 }:
 
@@ -13,6 +13,14 @@ stdenv.mkDerivation rec {
     sha256 = "0a0sqf6h227zalh0jrz6jpm8iwji7q3i31plqk76i4qm9vsgrhir";
   };
 
+  patches = [
+    (fetchurl {
+      url = "https://github.com/GilesBathgate/RapCAD/commit/278a8d6c7b8fe08f867002528bbab4a6319a7bb6.patch";
+      sha256 = "1vvkyf0wg79zdzs5zlggfrr1lrp1x75dglzl0mspnycwldsdwznj";
+      name = "disable-QVector-qHash.patch";
+    })
+  ];
+
   nativeBuildInputs = [ qmakeHook ];
   buildInputs = [ qtbase cgal boost gmp mpfr flex bison dxflib readline mesa_glu ];
 
@@ -21,6 +29,5 @@ stdenv.mkDerivation rec {
     maintainers = [ maintainers.raskin ];
     platforms = platforms.linux;
     description = ''Constructive solid geometry package'';
-    broken = true; # redefines template instance added in Qt 5.6
   };
 }