diff options
| author | Marek Mahut <marek.mahut@gmail.com> | 2019-07-28 21:18:55 +0200 |
|---|---|---|
| committer | Marek Mahut <marek.mahut@gmail.com> | 2019-07-28 22:54:01 +0200 |
| commit | 4ed879d97c1e7e7730bb17d32d605710d5704457 (patch) | |
| tree | a76d83ca3b87700e10014ca02b60c14db2297c7e /pkgs | |
| parent | 40c3d403d6282364c1c0f9c36310ce111e596bed (diff) | |
openscad: Use qt5's own mkDerivation
Fixes #65514, related to #65399.
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/graphics/openscad/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/applications/graphics/openscad/default.nix b/pkgs/applications/graphics/openscad/default.nix index ca3dac34dca..e074721b365 100644 --- a/pkgs/applications/graphics/openscad/default.nix +++ b/pkgs/applications/graphics/openscad/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchFromGitHub, qt5, libsForQt5 , bison, flex, eigen, boost, libGLU_combined, glew, opencsg, cgal , mpfr, gmp, glib, pkgconfig, harfbuzz, gettext, freetype, fontconfig -, double-conversion, lib3mf, libzip +, double-conversion, lib3mf, libzip, mkDerivation }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "openscad"; version = "2019.05"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3cee9ced81b..7b76b9f107e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19672,7 +19672,7 @@ in openorienteering-mapper = libsForQt5.callPackage ../applications/gis/openorienteering-mapper { }; - openscad = callPackage ../applications/graphics/openscad {}; + openscad = qt5.callPackage ../applications/graphics/openscad {}; opentimestamps-client = python3Packages.callPackage ../tools/misc/opentimestamps-client {}; |