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

Merge pull request #65522 from mmahut/openscad

Browse Source 
openscad: Use qt5's own mkDerivation
This commit is contained in:
worldofpeace 2019-07-28 17:39:33 -04:00 committed by GitHub
commit 239fffc90d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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

@ -19676,7 +19676,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 {};