diff options
| author | worldofpeace <worldofpeace@protonmail.ch> | 2019-07-28 17:39:33 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-28 17:39:33 -0400 |
| commit | 239fffc90d792b5362a20ec1a009978de7b8f91a (patch) | |
| tree | c4c33f19ea23d4bb89b61ce3dfcf3b4c6f3a056d | |
| parent | 22f8aa4b9036d44d09510b22709ecfa72025390d (diff) | |
| parent | 4ed879d97c1e7e7730bb17d32d605710d5704457 (diff) | |
| download | nixlib-239fffc90d792b5362a20ec1a009978de7b8f91a.tar nixlib-239fffc90d792b5362a20ec1a009978de7b8f91a.tar.gz nixlib-239fffc90d792b5362a20ec1a009978de7b8f91a.tar.bz2 nixlib-239fffc90d792b5362a20ec1a009978de7b8f91a.tar.lz nixlib-239fffc90d792b5362a20ec1a009978de7b8f91a.tar.xz nixlib-239fffc90d792b5362a20ec1a009978de7b8f91a.tar.zst nixlib-239fffc90d792b5362a20ec1a009978de7b8f91a.zip | |
Merge pull request #65522 from mmahut/openscad
openscad: Use qt5's own mkDerivation
| -rw-r--r-- | pkgs/applications/graphics/openscad/default.nix | 4 | ||||
| -rw-r--r-- | 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 f2b13e2e84d3..6903fc15ef11 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19676,7 +19676,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 {}; |