From 4ed879d97c1e7e7730bb17d32d605710d5704457 Mon Sep 17 00:00:00 2001 From: Marek Mahut Date: Sun, 28 Jul 2019 21:18:55 +0200 Subject: [PATCH] openscad: Use qt5's own mkDerivation Fixes #65514, related to #65399. --- pkgs/applications/graphics/openscad/default.nix | 4 ++-- 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 ca3dac34dca5..e074721b365d 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 3cee9ced81b7..7b76b9f107e2 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 {};