Merge pull request #181730 from Mic92/qt6

qt6.full: add

Changed files
+50
pkgs
development
libraries
top-level
+29
pkgs/development/libraries/qt-6/default.nix
···
, gst-vaapi
, gtk3
, dconf
, buildPackages
# options
···
./patches/qtbase-tzdir.patch
];
};
qt3d = callPackage ./modules/qt3d.nix { };
qt5compat = callPackage ./modules/qt5compat.nix { };
···
, gst-vaapi
, gtk3
, dconf
+
, libglvnd
, buildPackages
# options
···
./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 { };
+20
pkgs/development/libraries/qt-6/qt-env.nix
···
···
+
{ 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
+
'';
+
}
+1
pkgs/top-level/all-packages.nix
···
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;
cmake = cmake.overrideAttrs (attrs: {
patches = attrs.patches ++ [
../development/libraries/qt-6/patches/cmake.patch
···
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