Merge staging-next into staging

Changed files
+21 -17
nixos
pkgs
applications
development
libraries
qt-5
+1
nixos/tests/installer.nix
···
desktop-file-utils
docbook5
docbook_xsl_ns
libxml2.bin
libxslt.bin
nixos-artwork.wallpapers.simple-dark-gray-bottom
···
desktop-file-utils
docbook5
docbook_xsl_ns
+
kmod.dev
libxml2.bin
libxslt.bin
nixos-artwork.wallpapers.simple-dark-gray-bottom
+1 -10
pkgs/applications/kde/kitinerary.nix
···
-
{ mkDerivation, fetchpatch, lib, extra-cmake-modules
, qtdeclarative, ki18n, kmime, kpkpass
, poppler, kcontacts, kcalendarcore
, shared-mime-info
···
license = with lib.licenses; [ lgpl21 ];
maintainers = [ lib.maintainers.bkchr ];
};
-
-
patches = [
-
# Fix build with poppler 22.03
-
(fetchpatch {
-
url = "https://github.com/KDE/kitinerary/commit/e21d1ffc5fa81a636245f49c97fe7cda63abbb1d.patch";
-
sha256 = "1/zgq9QIOCPplqplDqgpoqzuYFf/m1Ixxawe50t2F04=";
-
})
-
];
-
nativeBuildInputs = [
extra-cmake-modules
shared-mime-info # for update-mime-database
···
+
{ mkDerivation, lib, extra-cmake-modules
, qtdeclarative, ki18n, kmime, kpkpass
, poppler, kcontacts, kcalendarcore
, shared-mime-info
···
license = with lib.licenses; [ lgpl21 ];
maintainers = [ lib.maintainers.bkchr ];
};
nativeBuildInputs = [
extra-cmake-modules
shared-mime-info # for update-mime-database
+6
pkgs/development/libraries/qt-5/5.12/default.nix
···
qtlocation = [ ./qtlocation-gcc-9.patch ];
qtscript = [ ./qtscript.patch ];
qtserialport = [ ./qtserialport.patch ];
qtwebengine = [
# glibc 2.34 compat
(fetchpatch {
···
qtlocation = [ ./qtlocation-gcc-9.patch ];
qtscript = [ ./qtscript.patch ];
qtserialport = [ ./qtserialport.patch ];
+
qtwayland = [
+
# NixOS-specific, ensure that app_id is correctly determined for
+
# wrapped executables from `wrapQtAppsHook` (see comment in patch for further
+
# context). Beware: shared among different Qt5 versions.
+
../modules/qtwayland-app_id.patch
+
];
qtwebengine = [
# glibc 2.34 compat
(fetchpatch {
+7 -1
pkgs/development/libraries/qt-5/5.14/default.nix
···
./qtwebkit-darwin-no-qos-classes.patch
];
qttools = [ ./qttools.patch ];
-
qtwayland = [ ./qtwayland-libdrm-build.patch ];
};
addPackages = self: with self;
···
./qtwebkit-darwin-no-qos-classes.patch
];
qttools = [ ./qttools.patch ];
+
qtwayland = [
+
./qtwayland-libdrm-build.patch
+
# NixOS-specific, ensure that app_id is correctly determined for
+
# wrapped executables from `wrapQtAppsHook` (see comment in patch for further
+
# context). Beware: shared among different Qt5 versions.
+
../modules/qtwayland-app_id.patch
+
];
};
addPackages = self: with self;
+6
pkgs/development/libraries/qt-5/5.15/default.nix
···
./qtwebengine-darwin-no-platform-check.patch
./qtwebengine-mac-dont-set-dsymutil-path.patch
];
qtwebkit = [
(fetchpatch {
name = "qtwebkit-bison-3.7-build.patch";
···
./qtwebengine-darwin-no-platform-check.patch
./qtwebengine-mac-dont-set-dsymutil-path.patch
];
+
qtwayland = [
+
# NixOS-specific, ensure that app_id is correctly determined for
+
# wrapped executables from `wrapQtAppsHook` (see comment in patch for further
+
# context). Beware: shared among different Qt5 versions.
+
../modules/qtwayland-app_id.patch
+
];
qtwebkit = [
(fetchpatch {
name = "qtwebkit-bison-3.7-build.patch";
-6
pkgs/development/libraries/qt-5/modules/qtwayland.nix
···
buildInputs = [ wayland ];
nativeBuildInputs = [ pkg-config ];
outputs = [ "out" "dev" "bin" ];
-
patches = [
-
# NixOS-specific, ensure that app_id is correctly determined for
-
# wrapped executables from `wrapQtAppsHook` (see comment in patch for further
-
# context).
-
./qtwayland-app_id.patch
-
];
}
···
buildInputs = [ wayland ];
nativeBuildInputs = [ pkg-config ];
outputs = [ "out" "dev" "bin" ];
}