pyrox.dev
Merge pull request #196410 from B4rc1/fix/ulauncher
fixes https://github.com/NixOS/nixpkgs/issues/119350
+5
-4
pkgs/applications/misc/ulauncher/default.nix
+5
-4
pkgs/applications/misc/ulauncher/default.nix
···
16
16
, wmctrl
17
17
, xvfb-run
18
18
, librsvg
19
+
, libX11
19
20
}:
20
21
21
22
python3Packages.buildPythonApplication rec {
22
23
pname = "ulauncher";
23
-
version = "5.12.1";
24
+
version = "5.15.0";
24
25
25
26
src = fetchurl {
26
27
url = "https://github.com/Ulauncher/Ulauncher/releases/download/${version}/ulauncher_${version}.tar.gz";
27
-
sha256 = "sha256-Fd3IOCEeXGV8zGd/8SzrWRsSsZRVePnsDaX8WrBrCOQ=";
28
+
sha256 = "sha256-1Qo6ffMtVRtZDPCHvHEl7T0dPdDUxP4TP2hkSVSdQpo";
28
29
};
29
30
30
31
nativeBuildInputs = with python3Packages; [
···
36
37
];
37
38
38
39
buildInputs = [
39
-
gdk-pixbuf
40
40
glib
41
41
gnome.adwaita-icon-theme
42
42
gtk3
···
71
71
72
72
patches = [
73
73
./fix-path.patch
74
-
./0001-Adjust-get_data_path-for-NixOS.patch
75
74
./fix-extensions.patch
76
75
];
77
76
···
108
107
makeWrapperArgs+=(
109
108
"''${gappsWrapperArgs[@]}"
110
109
--prefix PATH : "${lib.makeBinPath [ wmctrl ]}"
110
+
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libX11 ]}"
111
+
--prefix WEBKIT_DISABLE_COMPOSITING_MODE : "1"
111
112
)
112
113
'';
113
114
+5
-6
pkgs/applications/misc/ulauncher/fix-path.patch
+5
-6
pkgs/applications/misc/ulauncher/fix-path.patch
···
2
2
index 3616104..e9bbfda 100755
3
3
--- a/setup.py
4
4
+++ b/setup.py
5
-
@@ -112,7 +112,7 @@ class InstallAndUpdateDataDirectory(DistUtilsExtra.auto.install_auto):
6
-
DistUtilsExtra.auto.install_auto.run(self)
7
-
8
-
target_data = '/' + os.path.relpath(self.install_data, self.root) + '/'
5
+
@@ -94,7 +94,7 @@
6
+
# Root is undefined if not installing into an alternate root
7
+
root = self.root or "/"
8
+
target_data = '/' + os.path.relpath(self.install_data, root) + '/'
9
9
- target_pkgdata = target_data + 'share/ulauncher/'
10
10
+ target_pkgdata = '@out@/share/ulauncher/'
11
11
target_scripts = '/' + os.path.relpath(self.install_scripts,
12
-
self.root) + '/'
13
-
12
+
root) + '/'