git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #65522 from mmahut/openscad
239fffcworldofpeace
pkgs/applications/graphics/openscad/default.nix+2−2
@@ -1,10 +1,10 @@
1{ stdenv, fetchFromGitHub, qt5, libsForQt5
1{ stdenv, fetchFromGitHub, qt5, libsForQt5
2, bison, flex, eigen, boost, libGLU_combined, glew, opencsg, cgal
2, bison, flex, eigen, boost, libGLU_combined, glew, opencsg, cgal
3, mpfr, gmp, glib, pkgconfig, harfbuzz, gettext, freetype, fontconfig
3, mpfr, gmp, glib, pkgconfig, harfbuzz, gettext, freetype, fontconfig
4−, double-conversion, lib3mf, libzip
4+, double-conversion, lib3mf, libzip, mkDerivation
5}:
5}:
6
6
7−stdenv.mkDerivation rec {
7+mkDerivation rec {
8 pname = "openscad";
8 pname = "openscad";
9 version = "2019.05";
9 version = "2019.05";
10
10
pkgs/top-level/all-packages.nix+1−1
@@ -19676,7 +19676,7 @@ in
19676
19676
19677 openorienteering-mapper = libsForQt5.callPackage ../applications/gis/openorienteering-mapper { };
19677 openorienteering-mapper = libsForQt5.callPackage ../applications/gis/openorienteering-mapper { };
19678
19678
19679− openscad = callPackage ../applications/graphics/openscad {};
19679+ openscad = qt5.callPackage ../applications/graphics/openscad {};
19680
19680
19681 opentimestamps-client = python3Packages.callPackage ../tools/misc/opentimestamps-client {};
19681 opentimestamps-client = python3Packages.callPackage ../tools/misc/opentimestamps-client {};
19682
19682