diff options
| author | worldofpeace <worldofpeace@protonmail.ch> | 2019-07-29 03:46:21 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-29 03:46:21 -0400 |
| commit | a1fc5b42163e4ff13315b3a2f4a3207d565a57a3 (patch) | |
| tree | 749821acc9f7f4240505b0409b95676a800112af | |
| parent | 872b55a8c1c7fa110f26d5f29a8dc45f43bb267d (diff) | |
| parent | 71a76ff6a2a59f2e95cf3c9f005e8fa3e55c35d6 (diff) | |
| download | nixlib-a1fc5b42163e4ff13315b3a2f4a3207d565a57a3.tar nixlib-a1fc5b42163e4ff13315b3a2f4a3207d565a57a3.tar.gz nixlib-a1fc5b42163e4ff13315b3a2f4a3207d565a57a3.tar.bz2 nixlib-a1fc5b42163e4ff13315b3a2f4a3207d565a57a3.tar.lz nixlib-a1fc5b42163e4ff13315b3a2f4a3207d565a57a3.tar.xz nixlib-a1fc5b42163e4ff13315b3a2f4a3207d565a57a3.tar.zst nixlib-a1fc5b42163e4ff13315b3a2f4a3207d565a57a3.zip | |
Merge pull request #65531 from mmahut/openscad
openscad: not using qt5 and libsForQt5 directly
| -rw-r--r-- | pkgs/applications/graphics/openscad/default.nix | 37 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 31 insertions, 8 deletions
diff --git a/pkgs/applications/graphics/openscad/default.nix b/pkgs/applications/graphics/openscad/default.nix index e074721b365d..9f7fbc8421ba 100644 --- a/pkgs/applications/graphics/openscad/default.nix +++ b/pkgs/applications/graphics/openscad/default.nix @@ -1,7 +1,30 @@ -{ 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, mkDerivation +{ stdenv +, fetchFromGitHub +, qtbase +, qtmultimedia +, qscintilla +, bison +, flex +, eigen +, boost +, libGLU_combined +, glew +, opencsg +, cgal +, mpfr +, gmp +, glib +, pkgconfig +, harfbuzz +, gettext +, freetype +, fontconfig +, double-conversion +, lib3mf +, libzip +, mkDerivation +, qtmacextras +, qmake }: mkDerivation rec { @@ -15,14 +38,14 @@ mkDerivation rec { sha256 = "1qz384jqgk75zxk7sqd22ma9pyd94kh4h6a207ldx7p9rny6vc5l"; }; - nativeBuildInputs = [ bison flex pkgconfig gettext qt5.qmake ]; + nativeBuildInputs = [ bison flex pkgconfig gettext qmake ]; buildInputs = [ eigen boost glew opencsg cgal mpfr gmp glib harfbuzz lib3mf libzip double-conversion freetype fontconfig + qtbase qtmultimedia qscintilla ] ++ stdenv.lib.optional stdenv.isLinux libGLU_combined - ++ (with qt5; [qtbase qtmultimedia] ++ stdenv.lib.optional stdenv.isDarwin qtmacextras) - ++ (with libsForQt5; [qscintilla]) + ++ stdenv.lib.optional stdenv.isDarwin qtmacextras ; qmakeFlags = [ "VERSION=${version}" ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ca3fd42fb78b..4f41446a50ce 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19679,7 +19679,7 @@ in openorienteering-mapper = libsForQt5.callPackage ../applications/gis/openorienteering-mapper { }; - openscad = qt5.callPackage ../applications/graphics/openscad {}; + openscad = libsForQt5.callPackage ../applications/graphics/openscad {}; opentimestamps-client = python3Packages.callPackage ../tools/misc/opentimestamps-client {}; |