diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2022-11-20 20:12:14 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-20 20:12:14 +0100 |
| commit | 42c5aedcde03fb9eb0812ee565e0c196701adfeb (patch) | |
| tree | 5935bb96f6bb938d711af7b1bdf239ba3ac28e8a | |
| parent | ad52a62276115a7aa62bd36fd07b870c8be16a94 (diff) | |
| parent | ee1b9e6f7bd43f05684805ae376caf16330fa96e (diff) | |
Merge pull request #181730 from Mic92/qt6
qt6.full: add
| -rw-r--r-- | pkgs/development/libraries/qt-6/default.nix | 29 | ||||
| -rw-r--r-- | pkgs/development/libraries/qt-6/qt-env.nix | 20 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 1 |
3 files changed, 50 insertions, 0 deletions
diff --git a/pkgs/development/libraries/qt-6/default.nix b/pkgs/development/libraries/qt-6/default.nix index 4c36e29f02f2c..b2409b1398f00 100644 --- a/pkgs/development/libraries/qt-6/default.nix +++ b/pkgs/development/libraries/qt-6/default.nix @@ -22,6 +22,7 @@ , gst-vaapi , gtk3 , dconf +, libglvnd , buildPackages # options @@ -57,6 +58,34 @@ let ./patches/qtbase-tzdir.patch ]; }; + 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" <<EOF + [Paths] + Prefix = $out + Plugins = ${qtbase.qtPluginPrefix} + Qml2Imports = ${qtbase.qtQmlPrefix} + EOF + ''; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d1ccb4d98efd4..0afc9a0a37c24 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22059,6 +22059,7 @@ with pkgs; inherit bison cups dconf harfbuzz libGL perl gtk3 ninja; inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good gst-libav gst-vaapi; inherit buildPackages; + inherit libglvnd; cmake = cmake.overrideAttrs (attrs: { patches = attrs.patches ++ [ ../development/libraries/qt-6/patches/cmake.patch |