diff options
| author | Thomas Tuegel <ttuegel@secure.mailbox.org> | 2017-03-26 09:18:38 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-26 09:18:38 -0500 |
| commit | 8b50f4c9901297efac072526c610c5849d56529d (patch) | |
| tree | fb3df0f4708ad62bd8f86dfffb0f6ffd25b4153b /pkgs/applications/graphics | |
| parent | b90d1a4496eebad6fc5bda330da3d01581627e3d (diff) | |
| parent | 9125bab708fcacbfbf7b77e44935c8ce254de3b9 (diff) | |
| download | nixlib-8b50f4c9901297efac072526c610c5849d56529d.tar nixlib-8b50f4c9901297efac072526c610c5849d56529d.tar.gz nixlib-8b50f4c9901297efac072526c610c5849d56529d.tar.bz2 nixlib-8b50f4c9901297efac072526c610c5849d56529d.tar.lz nixlib-8b50f4c9901297efac072526c610c5849d56529d.tar.xz nixlib-8b50f4c9901297efac072526c610c5849d56529d.tar.zst nixlib-8b50f4c9901297efac072526c610c5849d56529d.zip | |
Merge pull request #24299 from ttuegel/master--drop-qt-5.7
Drop Qt 5.5 and Qt 5.7 from master
Diffstat (limited to 'pkgs/applications/graphics')
| -rw-r--r-- | pkgs/applications/graphics/rapcad/default.nix | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/pkgs/applications/graphics/rapcad/default.nix b/pkgs/applications/graphics/rapcad/default.nix index 118630e96088..b7672a39d0df 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 ]; |