git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #65522 from mmahut/openscad

openscad: Use qt5's own mkDerivation

commit239fffc90d792b5362a20ec1a009978de7b8f91a authorworldofpeace <worldofpeace@protonmail.ch> dateSun 28 Jul 2019, 17:39 (7 years ago) parent22f8aa44ed879d
2 files changed+3−3
pkgs/applications/graphics/openscad/default.nix+2−2 pkgs/top-level/all-packages.nix+1−1
pkgs/applications/graphics/openscad/default.nix+2−2
@@ -1,10 +1,10 @@
11{ stdenv, fetchFromGitHub, qt5, libsForQt5
22, bison, flex, eigen, boost, libGLU_combined, glew, opencsg, cgal
33, mpfr, gmp, glib, pkgconfig, harfbuzz, gettext, freetype, fontconfig
4−, double-conversion, lib3mf, libzip
4+, double-conversion, lib3mf, libzip, mkDerivation
55}:
66
7−stdenv.mkDerivation rec {
7+mkDerivation rec {
88 pname = "openscad";
99 version = "2019.05";
1010
pkgs/top-level/all-packages.nix+1−1
@@ -19676,7 +19676,7 @@ in
1967619676
1967719677 openorienteering-mapper = libsForQt5.callPackage ../applications/gis/openorienteering-mapper { };
1967819678
19679− openscad = callPackage ../applications/graphics/openscad {};
19679+ openscad = qt5.callPackage ../applications/graphics/openscad {};
1968019680
1968119681 opentimestamps-client = python3Packages.callPackage ../tools/misc/opentimestamps-client {};
1968219682