movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-13 21:50:33 +03:00
Code Activity

firewalld: wrap gui programs with qt6

Browse source
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
1 changed files with 32 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

53
pkgs/by-name/fi/firewalld/package.nix
View file

@ -21,6 +21,7 @@
networkmanagerapplet, networkmanagerapplet,
pkg-config, pkg-config,
python3, python3,
qt6,
sysctl, sysctl,
wrapGAppsNoGuiHook, wrapGAppsNoGuiHook,
withGui ? false, withGui ? false,
@ -72,24 +73,28 @@ stdenv.mkDerivation rec {
--replace-fail "/usr/bin/nm-connection-editor" "${networkmanagerapplet}/bin/nm-connection-editor" --replace-fail "/usr/bin/nm-connection-editor" "${networkmanagerapplet}/bin/nm-connection-editor"
''; '';
nativeBuildInputs = [ nativeBuildInputs =
autoconf [
automake autoconf
docbook_xml_dtd_42 automake
docbook-xsl-nons docbook_xml_dtd_42
glib docbook-xsl-nons
intltool glib
ipset intltool
iptables ipset
kmod iptables
libxml2 kmod
libxslt libxml2
pkg-config libxslt
python3 pkg-config
python3.pkgs.wrapPython python3
sysctl python3.pkgs.wrapPython
wrapGAppsNoGuiHook sysctl
]; wrapGAppsNoGuiHook
]
++ lib.optionals withGui [
qt6.wrapQtAppsHook
];
buildInputs = buildInputs =
[ [
@ -105,6 +110,7 @@ stdenv.mkDerivation rec {
++ lib.optionals withGui [ ++ lib.optionals withGui [
gtk3 gtk3
libnotify libnotify
qt6.qtbase
]; ];
preConfigure = '' preConfigure = ''
@ -116,10 +122,15 @@ stdenv.mkDerivation rec {
''; '';
dontWrapGApps = true; dontWrapGApps = true;
dontWrapQtApps = true;
preFixup = '' preFixup =
makeWrapperArgs+=("''${gappsWrapperArgs[@]}") ''
''; makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
''
+ lib.optionalString withGui ''
makeWrapperArgs+=("''${qtWrapperArgs[@]}")
'';
postFixup = '' postFixup = ''
chmod +x $out/share/firewalld/*.py $out/share/firewalld/testsuite/python/*.py $out/share/firewalld/testsuite/{,integration/}testsuite chmod +x $out/share/firewalld/*.py $out/share/firewalld/testsuite/python/*.py $out/share/firewalld/testsuite/{,integration/}testsuite