b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse source
This commit is contained in:
github-actions[bot] 2022-04-05 18:02:16 +00:00 committed by GitHub
parent 3063a8ea39 6427998d85
commit 29bffe5afe
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 21 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
nixos/tests/installer.nix
View file

@ -312,6 +312,7 @@ let
desktop-file-utils
docbook5
docbook_xsl_ns
kmod.dev
libxml2.bin
libxslt.bin
nixos-artwork.wallpapers.simple-dark-gray-bottom

11
pkgs/applications/kde/kitinerary.nix
View file

@ -1,4 +1,4 @@
{ mkDerivation, fetchpatch, lib, extra-cmake-modules
{ mkDerivation, lib, extra-cmake-modules
, qtdeclarative, ki18n, kmime, kpkpass
, poppler, kcontacts, kcalendarcore
, shared-mime-info
@ -10,15 +10,6 @@ mkDerivation {
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

6
pkgs/development/libraries/qt-5/5.12/default.nix
View file

@ -84,6 +84,12 @@ let
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 {

8
pkgs/development/libraries/qt-5/5.14/default.nix
View file

@ -126,7 +126,13 @@ let
./qtwebkit-darwin-no-qos-classes.patch
];
qttools = [ ./qttools.patch ];
qtwayland = [ ./qtwayland-libdrm-build.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
View file

@ -60,6 +60,12 @@ let
./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
View file

@ -6,10 +6,4 @@ qtModule {
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
];
}