public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

openscad: Use qt5's own mkDerivation

Browse Source 
Fixes #65514, related to #65399.
This commit is contained in:
Marek Mahut 2019-07-28 21:18:55 +02:00
parent 40c3d403d6
commit 4ed879d97c
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/graphics/openscad/default.nix
View File

@ -1,10 +1,10 @@
{ stdenv, fetchFromGitHub, qt5, libsForQt5 { stdenv, fetchFromGitHub, qt5, libsForQt5
, bison, flex, eigen, boost, libGLU_combined, glew, opencsg, cgal , bison, flex, eigen, boost, libGLU_combined, glew, opencsg, cgal
, mpfr, gmp, glib, pkgconfig, harfbuzz, gettext, freetype, fontconfig , mpfr, gmp, glib, pkgconfig, harfbuzz, gettext, freetype, fontconfig
, double-conversion, lib3mf, libzip , double-conversion, lib3mf, libzip, mkDerivation
}: }:
stdenv.mkDerivation rec { mkDerivation rec {
pname = "openscad"; pname = "openscad";
version = "2019.05"; version = "2019.05";

2
pkgs/top-level/all-packages.nix
View File

@ -19672,7 +19672,7 @@ in
openorienteering-mapper = libsForQt5.callPackage ../applications/gis/openorienteering-mapper { }; 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 {}; opentimestamps-client = python3Packages.callPackage ../tools/misc/opentimestamps-client {};