firewalld: wrap gui programs with qt6

+32 -21
+32 -21
pkgs/by-name/fi/firewalld/package.nix
··· 21 networkmanagerapplet, 22 pkg-config, 23 python3, 24 sysctl, 25 wrapGAppsNoGuiHook, 26 withGui ? false, ··· 72 --replace-fail "/usr/bin/nm-connection-editor" "${networkmanagerapplet}/bin/nm-connection-editor" 73 ''; 74 75 - nativeBuildInputs = [ 76 - autoconf 77 - automake 78 - docbook_xml_dtd_42 79 - docbook-xsl-nons 80 - glib 81 - intltool 82 - ipset 83 - iptables 84 - kmod 85 - libxml2 86 - libxslt 87 - pkg-config 88 - python3 89 - python3.pkgs.wrapPython 90 - sysctl 91 - wrapGAppsNoGuiHook 92 - ]; 93 94 buildInputs = 95 [ ··· 105 ++ lib.optionals withGui [ 106 gtk3 107 libnotify 108 ]; 109 110 preConfigure = '' ··· 116 ''; 117 118 dontWrapGApps = true; 119 120 - preFixup = '' 121 - makeWrapperArgs+=("''${gappsWrapperArgs[@]}") 122 - ''; 123 124 postFixup = '' 125 chmod +x $out/share/firewalld/*.py $out/share/firewalld/testsuite/python/*.py $out/share/firewalld/testsuite/{,integration/}testsuite
··· 21 networkmanagerapplet, 22 pkg-config, 23 python3, 24 + qt6, 25 sysctl, 26 wrapGAppsNoGuiHook, 27 withGui ? false, ··· 73 --replace-fail "/usr/bin/nm-connection-editor" "${networkmanagerapplet}/bin/nm-connection-editor" 74 ''; 75 76 + nativeBuildInputs = 77 + [ 78 + autoconf 79 + automake 80 + docbook_xml_dtd_42 81 + docbook-xsl-nons 82 + glib 83 + intltool 84 + ipset 85 + iptables 86 + kmod 87 + libxml2 88 + libxslt 89 + pkg-config 90 + python3 91 + python3.pkgs.wrapPython 92 + sysctl 93 + wrapGAppsNoGuiHook 94 + ] 95 + ++ lib.optionals withGui [ 96 + qt6.wrapQtAppsHook 97 + ]; 98 99 buildInputs = 100 [ ··· 110 ++ lib.optionals withGui [ 111 gtk3 112 libnotify 113 + qt6.qtbase 114 ]; 115 116 preConfigure = '' ··· 122 ''; 123 124 dontWrapGApps = true; 125 + dontWrapQtApps = true; 126 127 + preFixup = 128 + '' 129 + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") 130 + '' 131 + + lib.optionalString withGui '' 132 + makeWrapperArgs+=("''${qtWrapperArgs[@]}") 133 + ''; 134 135 postFixup = '' 136 chmod +x $out/share/firewalld/*.py $out/share/firewalld/testsuite/python/*.py $out/share/firewalld/testsuite/{,integration/}testsuite