uboot: (firmwareOdroidC2/C4) don't invoke patch tool, use patches = [] instead
https://github.com/NixOS/nixpkgs/blob/master/pkgs/stdenv/generic/setup.sh#L948 this can do it nicely. Signed-off-by: Anton Arapov <anton@deadbeef.mx>
This commit is contained in:
Anton Arapov
Alan Daniels
commit
56de2bcd43
30691 changed files with 3076956 additions and 0 deletions
|
|
@ -0,0 +1,55 @@
|
|||
From 86cc27022015697a61d1ec1b13e52f9dbe7f6c57 Mon Sep 17 00:00:00 2001
|
||||
From: worldofpeace <worldofpeace@protonmail.ch>
|
||||
Date: Mon, 23 Mar 2020 18:34:00 -0400
|
||||
Subject: [PATCH] Adjust get_data_path for NixOS
|
||||
|
||||
We construct the ulauncher data path from xdg_data_dirs
|
||||
and prevent it from being a nix store path or being xdg_data_home.
|
||||
We do this to prevent /nix/store paths being hardcoded to shortcuts.json.
|
||||
On NixOS this path will either be /run/current-system/sw/share/ulauncher
|
||||
or $HOME/.nix-profile/share/ulauncher if the user used nix-env.
|
||||
---
|
||||
ulauncher/config.py | 27 ++++++++++++++++++---------
|
||||
1 file changed, 18 insertions(+), 9 deletions(-)
|
||||
|
||||
diff --git a/ulauncher/config.py b/ulauncher/config.py
|
||||
index f21014e..cc636e1 100644
|
||||
--- a/ulauncher/config.py
|
||||
+++ b/ulauncher/config.py
|
||||
@@ -50,15 +50,24 @@ def get_data_path():
|
||||
is specified at installation time.
|
||||
"""
|
||||
|
||||
- # Get pathname absolute or relative.
|
||||
- path = os.path.join(
|
||||
- os.path.dirname(__file__), __ulauncher_data_directory__)
|
||||
-
|
||||
- abs_data_path = os.path.abspath(path)
|
||||
- if not os.path.exists(abs_data_path):
|
||||
- raise ProjectPathNotFoundError(abs_data_path)
|
||||
-
|
||||
- return abs_data_path
|
||||
+ paths = list(
|
||||
+ filter(
|
||||
+ os.path.exists,
|
||||
+ [
|
||||
+ os.path.join(dir, "ulauncher")
|
||||
+ for dir in xdg_data_dirs
|
||||
+ # Get path that isn't in the /nix/store so they don't get hardcoded into configs
|
||||
+ if not dir.startswith("/nix/store/")
|
||||
+ # Exclude .local/share/ulauncher which isn't what we want
|
||||
+ if not dir.startswith(xdg_data_home)
|
||||
+ ],
|
||||
+ )
|
||||
+ )
|
||||
+
|
||||
+ try:
|
||||
+ return paths[0]
|
||||
+ except:
|
||||
+ raise ProjectPathNotFoundError()
|
||||
|
||||
|
||||
def is_wayland():
|
||||
--
|
||||
2.25.1
|
||||
|
||||
130
pkgs/applications/misc/ulauncher/default.nix
Normal file
130
pkgs/applications/misc/ulauncher/default.nix
Normal file
|
|
@ -0,0 +1,130 @@
|
|||
{ lib
|
||||
, fetchurl
|
||||
, nix-update-script
|
||||
, python3Packages
|
||||
, gdk-pixbuf
|
||||
, glib
|
||||
, gnome
|
||||
, gobject-introspection
|
||||
, gtk3
|
||||
, wrapGAppsHook
|
||||
, webkitgtk
|
||||
, libnotify
|
||||
, keybinder3
|
||||
, libappindicator
|
||||
, intltool
|
||||
, wmctrl
|
||||
, xvfb-run
|
||||
, librsvg
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "ulauncher";
|
||||
version = "5.12.1";
|
||||
|
||||
disabled = python3Packages.isPy27;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/Ulauncher/Ulauncher/releases/download/${version}/ulauncher_${version}.tar.gz";
|
||||
sha256 = "sha256-Fd3IOCEeXGV8zGd/8SzrWRsSsZRVePnsDaX8WrBrCOQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with python3Packages; [
|
||||
distutils_extra
|
||||
intltool
|
||||
wrapGAppsHook
|
||||
gdk-pixbuf
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
gdk-pixbuf
|
||||
glib
|
||||
gnome.adwaita-icon-theme
|
||||
gobject-introspection
|
||||
gtk3
|
||||
keybinder3
|
||||
libappindicator
|
||||
libnotify
|
||||
librsvg
|
||||
webkitgtk
|
||||
wmctrl
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
mock
|
||||
mypy
|
||||
mypy-extensions
|
||||
dbus-python
|
||||
pygobject3
|
||||
pyinotify
|
||||
python-Levenshtein
|
||||
pyxdg
|
||||
pycairo
|
||||
requests
|
||||
websocket-client
|
||||
];
|
||||
|
||||
checkInputs = with python3Packages; [
|
||||
mock
|
||||
pytest
|
||||
pytest-mock
|
||||
xvfb-run
|
||||
];
|
||||
|
||||
patches = [
|
||||
./fix-path.patch
|
||||
./0001-Adjust-get_data_path-for-NixOS.patch
|
||||
./fix-extensions.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py --subst-var out
|
||||
patchShebangs bin/ulauncher-toggle
|
||||
substituteInPlace bin/ulauncher-toggle \
|
||||
--replace wmctrl ${wmctrl}/bin/wmctrl
|
||||
'';
|
||||
|
||||
# https://github.com/Ulauncher/Ulauncher/issues/390
|
||||
doCheck = false;
|
||||
|
||||
preCheck = ''
|
||||
export PYTHONPATH=$PYTHONPATH:$out/${python3Packages.python.sitePackages}
|
||||
'';
|
||||
|
||||
# Simple translation of
|
||||
# - https://github.com/Ulauncher/Ulauncher/blob/f5a601bdca75198a6a31b9d84433496b63530e74/test
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
|
||||
# skip tests in invocation that handle paths that
|
||||
# aren't nix friendly (i think)
|
||||
xvfb-run -s '-screen 0 1024x768x16' \
|
||||
pytest -k 'not TestPath and not test_handle_key_press_event' tests
|
||||
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
# do not double wrap
|
||||
dontWrapGApps = true;
|
||||
preFixup = ''
|
||||
makeWrapperArgs+=(
|
||||
"''${gappsWrapperArgs[@]}"
|
||||
--prefix PATH : "${lib.makeBinPath [ wmctrl ]}"
|
||||
)
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script {
|
||||
attrPath = pname;
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
meta = with lib; {
|
||||
description = "A fast application launcher for Linux, written in Python, using GTK";
|
||||
homepage = "https://ulauncher.io/";
|
||||
license = licenses.gpl3;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ aaronjanse ];
|
||||
};
|
||||
}
|
||||
13
pkgs/applications/misc/ulauncher/fix-extensions.patch
Normal file
13
pkgs/applications/misc/ulauncher/fix-extensions.patch
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
diff --git a/ulauncher/api/server/ExtensionRunner.py b/ulauncher/api/server/ExtensionRunner.py
|
||||
index 22042bf..f7b31c8 100644
|
||||
--- a/ulauncher/api/server/ExtensionRunner.py
|
||||
+++ b/ulauncher/api/server/ExtensionRunner.py
|
||||
@@ -79,7 +79,7 @@ class ExtensionRunner:
|
||||
cmd = [sys.executable, os.path.join(self.extensions_dir, extension_id, 'main.py')]
|
||||
env = os.environ.copy()
|
||||
env['ULAUNCHER_WS_API'] = self.extension_server.generate_ws_url(extension_id)
|
||||
- env['PYTHONPATH'] = ':'.join(filter(bool, [ULAUNCHER_APP_DIR, os.getenv('PYTHONPATH')]))
|
||||
+ env['PYTHONPATH'] = ':'.join([ULAUNCHER_APP_DIR] + sys.path)
|
||||
|
||||
if self.verbose:
|
||||
env['VERBOSE'] = '1'
|
||||
13
pkgs/applications/misc/ulauncher/fix-path.patch
Normal file
13
pkgs/applications/misc/ulauncher/fix-path.patch
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
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) + '/'
|
||||
- target_pkgdata = target_data + 'share/ulauncher/'
|
||||
+ target_pkgdata = '@out@/share/ulauncher/'
|
||||
target_scripts = '/' + os.path.relpath(self.install_scripts,
|
||||
self.root) + '/'
|
||||
|
||||
Loading…
Add table
Add a link
Reference in a new issue