public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #41027 from kamilchm/qtile 

qtile: 0.10.7 -> 0.11.1
This commit is contained in:
xeji 2018-05-24 18:04:15 +02:00 committed by GitHub
parent 8d4716ac90 bd3489e04a
commit a54c1c25c5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/window-managers/qtile/0001-Substitution-vars-for-absolute-paths.patch
View File

@ -23,8 +23,8 @@ index f1133555..3e61204a 100644
def _setup_xcursor_binding(self): def _setup_xcursor_binding(self):
try: try:
- xcursor = ffi.dlopen('libxcb-cursor.so') - xcursor = ffi.dlopen('libxcb-cursor.so.0')
+ xcursor = ffi.dlopen('@xcb-cursor@/lib/libxcb-cursor.so') + xcursor = ffi.dlopen('@xcb-cursor@/lib/libxcb-cursor.so.0')
except OSError: except OSError:
logger.warning("xcb-cursor not found, fallback to font pointer") logger.warning("xcb-cursor not found, fallback to font pointer")
return False return False

10
pkgs/applications/window-managers/qtile/0002-Restore-PATH-and-PYTHONPATH.patch
View File

@ -43,13 +43,13 @@ index 5316e0e7..272c6430 100755
from libqtile.scripts import qtile_top from libqtile.scripts import qtile_top
qtile_top.main() qtile_top.main()
diff --git a/libqtile/utils.py b/libqtile/utils.py diff --git a/libqtile/utils.py b/libqtile/utils.py
index 36ed0a58..bca9eab3 100644 index 550ed02677e..1358a66f3df 100644
--- a/libqtile/utils.py --- a/libqtile/utils.py
+++ b/libqtile/utils.py +++ b/libqtile/utils.py
@@ -240,3 +240,11 @@ def describe_attributes(obj, attrs, func=None): @@ -272,3 +272,11 @@ def safe_import(module_names, class_name, globals_, fallback=None):
pairs.append('%s=%s' % (attr, value)) logger.debug("%s", traceback.format_exc())
if fallback:
return ', '.join(pairs) globals_[class_name] = fallback(module_path, class_name, error)
+ +
+ +
+def restore_os_environment(): +def restore_os_environment():

12
pkgs/applications/window-managers/qtile/0003-Restart-executable.patch
View File

@ -1,13 +1,13 @@
diff --git a/libqtile/manager.py b/libqtile/manager.py diff --git a/libqtile/manager.py b/libqtile/manager.py
index 36518a74..9b6bdd02 100644 index fc198e9bae7..860b97d8db1 100644
--- a/libqtile/manager.py --- a/libqtile/manager.py
+++ b/libqtile/manager.py +++ b/libqtile/manager.py
@@ -1386,7 +1386,7 @@ class Qtile(command.CommandObject): @@ -1402,7 +1402,7 @@ class Qtile(command.CommandObject):
logger.error("Unable to pickle qtile state")
argv = [s for s in argv if not s.startswith('--with-state')] argv = [s for s in argv if not s.startswith('--with-state')]
argv.append('--with-state=' + buf.getvalue().decode()) argv.append('--with-state=' + buf.getvalue().decode())
- self._restart = (sys.executable, argv)
- self.cmd_execute(sys.executable, argv) + self._restart = (os.environ.get("QTILE_WRAPPER", "@out@/bin/qtile"), argv[1:])
+ self.cmd_execute(os.environ.get("QTILE_WRAPPER", "@out@/bin/qtile"), argv[1:]) self.stop()
def cmd_spawn(self, cmd): def cmd_spawn(self, cmd):
"""Run cmd in a shell.

4
pkgs/applications/window-managers/qtile/default.nix
View File

@ -7,13 +7,13 @@ in
python27Packages.buildPythonApplication rec { python27Packages.buildPythonApplication rec {
name = "qtile-${version}"; name = "qtile-${version}";
version = "0.10.7"; version = "0.11.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "qtile"; owner = "qtile";
repo = "qtile"; repo = "qtile";
rev = "v${version}"; rev = "v${version}";
sha256 = "18szgplyym0b65vnaa8nqzadq6q0mhsiky9g5hqhn7xzf4kykmj8"; sha256 = "1jw6mh9m5yrijhm218lc51sc89lc2ihvyx30jhrkxy2mzllhjgrs";
}; };
patches = [ patches = [