nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-17 09:34:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

qt5*.qtwayland: deconflict patching

Browse Source 
This fixes build in qt514 case.

The usual way here is to provide patches for each qt5 version
separately.  No other module adds them in this generic way.
The problem is when you combine the approaches; qtModule will only
take the list from the module and ignore the version-specific list.
This commit is contained in:
Vladimír Čunát 2022-04-05 15:11:56 +02:00
parent 249aa8d8dc
commit db57a90dcc
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
4 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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
];
}