From ee1b9e6f7bd43f05684805ae376caf16330fa96e Mon Sep 17 00:00:00 2001 From: Jörg Thalheim Date: Sat, 16 Jul 2022 15:30:49 +0200 Subject: qt6.full: add --- pkgs/development/libraries/qt-6/default.nix | 29 +++++++++++++++++++++++++++++ pkgs/development/libraries/qt-6/qt-env.nix | 20 ++++++++++++++++++++ 2 files changed, 49 insertions(+) create mode 100644 pkgs/development/libraries/qt-6/qt-env.nix (limited to 'pkgs/development/libraries/qt-6') diff --git a/pkgs/development/libraries/qt-6/default.nix b/pkgs/development/libraries/qt-6/default.nix index 8c12cc2fb671a..d6950538e741c 100644 --- a/pkgs/development/libraries/qt-6/default.nix +++ b/pkgs/development/libraries/qt-6/default.nix @@ -19,6 +19,7 @@ , gst-plugins-base , gtk3 , dconf +, libglvnd , buildPackages # options @@ -50,6 +51,34 @@ let inherit (srcs.qtbase) src version; inherit bison cups harfbuzz libGL dconf gtk3 developerBuild cmake; }; + env = callPackage ./qt-env.nix {}; + full = env "qt-full-${qtbase.version}" ([ + qt3d + qt5compat + qtcharts + qtconnectivity + qtdeclarative + qtdoc + qtimageformats + qtlottie + qtmultimedia + qtnetworkauth + qtpositioning + qtsensors + qtserialbus + qtserialport + qtshadertools + qtquick3d + qtsvg + qtscxml + qttools + qttranslations + qtvirtualkeyboard + qtwebchannel + qtwebengine + qtwebsockets + qtwebview + ] ++ lib.optionals (!stdenv.isDarwin) [ qtwayland libglvnd ]); qt3d = callPackage ./modules/qt3d.nix { }; qt5compat = callPackage ./modules/qt5compat.nix { }; diff --git a/pkgs/development/libraries/qt-6/qt-env.nix b/pkgs/development/libraries/qt-6/qt-env.nix new file mode 100644 index 0000000000000..0b41f0c073517 --- /dev/null +++ b/pkgs/development/libraries/qt-6/qt-env.nix @@ -0,0 +1,20 @@ +{ buildEnv, qtbase }: name: paths: + +buildEnv { + inherit name; + paths = [ qtbase ] ++ paths; + + pathsToLink = [ "/bin" "/mkspecs" "/include" "/lib" "/share" "/libexec" ]; + extraOutputsToInstall = [ "out" "dev" ]; + + postBuild = '' + rm "$out/bin/qmake" + cp "${qtbase.dev}/bin/qmake" "$out/bin" + cat >"$out/bin/qt.conf" <