pyrox.dev
firewalld: wrap gui programs with qt6
+32
-21
pkgs/by-name/fi/firewalld/package.nix
+32
-21
pkgs/by-name/fi/firewalld/package.nix
···
21
21
networkmanagerapplet,
22
22
pkg-config,
23
23
python3,
24
+
qt6,
24
25
sysctl,
25
26
wrapGAppsNoGuiHook,
26
27
withGui ? false,
···
72
73
--replace-fail "/usr/bin/nm-connection-editor" "${networkmanagerapplet}/bin/nm-connection-editor"
73
74
'';
74
75
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
-
];
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
+
];
93
98
94
99
buildInputs =
95
100
[
···
105
110
++ lib.optionals withGui [
106
111
gtk3
107
112
libnotify
113
+
qt6.qtbase
108
114
];
109
115
110
116
preConfigure = ''
···
116
122
'';
117
123
118
124
dontWrapGApps = true;
125
+
dontWrapQtApps = true;
119
126
120
-
preFixup = ''
121
-
makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
122
-
'';
127
+
preFixup =
128
+
''
129
+
makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
130
+
''
131
+
+ lib.optionalString withGui ''
132
+
makeWrapperArgs+=("''${qtWrapperArgs[@]}")
133
+
'';
123
134
124
135
postFixup = ''
125
136
chmod +x $out/share/firewalld/*.py $out/share/firewalld/testsuite/python/*.py $out/share/firewalld/testsuite/{,integration/}testsuite