summary refs log tree commit diff
path: root/pkgs/applications/misc/ulauncher/fix-path.patch
diff options
context:
space:
mode:
authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>2022-11-17 00:15:28 +0000
committerGitHub <noreply@github.com>2022-11-17 00:15:28 +0000
commit88ec79e8f9cf08a65123641741698f145ab0f9a1 (patch)
treebda72b7a0043fbdcc0ef20bbbeb0fab91ffe00b4 /pkgs/applications/misc/ulauncher/fix-path.patch
parenta7e53e534a2b8894aea20233e59579fa207dcb12 (diff)
parentebf9fcd06dbcd86536cbd636b4626a32e91ddabb (diff)
downloadnixpkgs-88ec79e8f9cf08a65123641741698f145ab0f9a1.tar
nixpkgs-88ec79e8f9cf08a65123641741698f145ab0f9a1.tar.gz
nixpkgs-88ec79e8f9cf08a65123641741698f145ab0f9a1.tar.bz2
nixpkgs-88ec79e8f9cf08a65123641741698f145ab0f9a1.tar.lz
nixpkgs-88ec79e8f9cf08a65123641741698f145ab0f9a1.tar.xz
nixpkgs-88ec79e8f9cf08a65123641741698f145ab0f9a1.tar.zst
nixpkgs-88ec79e8f9cf08a65123641741698f145ab0f9a1.zip
Merge master into haskell-updates
Diffstat (limited to 'pkgs/applications/misc/ulauncher/fix-path.patch')
-rw-r--r--pkgs/applications/misc/ulauncher/fix-path.patch11
1 files changed, 5 insertions, 6 deletions
diff --git a/pkgs/applications/misc/ulauncher/fix-path.patch b/pkgs/applications/misc/ulauncher/fix-path.patch
index 2936df65194..bb5b8e38d33 100644
--- a/pkgs/applications/misc/ulauncher/fix-path.patch
+++ b/pkgs/applications/misc/ulauncher/fix-path.patch
@@ -2,12 +2,11 @@ diff --git a/setup.py b/setup.py
 index 3616104..e9bbfda 100755
 --- a/setup.py
 +++ b/setup.py
-@@ -112,7 +112,7 @@ class InstallAndUpdateDataDirectory(DistUtilsExtra.auto.install_auto):
-         DistUtilsExtra.auto.install_auto.run(self)
- 
-         target_data = '/' + os.path.relpath(self.install_data, self.root) + '/'
+@@ -94,7 +94,7 @@
+         # Root is undefined if not installing into an alternate root
+         root = self.root or "/"
+         target_data = '/' + os.path.relpath(self.install_data, root) + '/'
 -        target_pkgdata = target_data + 'share/ulauncher/'
 +        target_pkgdata = '@out@/share/ulauncher/'
          target_scripts = '/' + os.path.relpath(self.install_scripts,
-                                                self.root) + '/'
- 
+                                                root) + '/'