0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-14 06:00:33 +03:00

firewalld: wrap gui programs with qt6

This commit is contained in:
Sizhe Zhao 2025-03-24 23:36:52 +08:00
parent 3a1c054bb9
commit ee19ecd464
No known key found for this signature in database
GPG key ID: ED1807251A7DA08F

View file

@ -21,6 +21,7 @@
networkmanagerapplet,
pkg-config,
python3,
qt6,
sysctl,
wrapGAppsNoGuiHook,
withGui ? false,
@ -72,7 +73,8 @@ stdenv.mkDerivation rec {
--replace-fail "/usr/bin/nm-connection-editor" "${networkmanagerapplet}/bin/nm-connection-editor"
'';
nativeBuildInputs = [
nativeBuildInputs =
[
autoconf
automake
docbook_xml_dtd_42
@ -89,6 +91,9 @@ stdenv.mkDerivation rec {
python3.pkgs.wrapPython
sysctl
wrapGAppsNoGuiHook
]
++ lib.optionals withGui [
qt6.wrapQtAppsHook
];
buildInputs =
@ -105,6 +110,7 @@ stdenv.mkDerivation rec {
++ lib.optionals withGui [
gtk3
libnotify
qt6.qtbase
];
preConfigure = ''
@ -116,9 +122,14 @@ stdenv.mkDerivation rec {
'';
dontWrapGApps = true;
dontWrapQtApps = true;
preFixup = ''
preFixup =
''
makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
''
+ lib.optionalString withGui ''
makeWrapperArgs+=("''${qtWrapperArgs[@]}")
'';
postFixup = ''