diff options
author | Alyssa Ross <hi@alyssa.is> | 2023-10-20 22:09:03 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2023-10-20 22:09:03 +0000 |
commit | 50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e (patch) | |
tree | f2556b911180125ccbb7ed0e78a54e92da89adce /nixpkgs/pkgs/development/python-modules/qtile/default.nix | |
parent | 4c16d4548a98563c9d9ad76f4e5b2202864ccd54 (diff) | |
parent | cfc75eec4603c06503ae750f88cf397e00796ea8 (diff) | |
download | nixlib-50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e.tar nixlib-50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e.tar.gz nixlib-50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e.tar.bz2 nixlib-50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e.tar.lz nixlib-50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e.tar.xz nixlib-50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e.tar.zst nixlib-50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e.zip |
Merge commit 'cfc75eec4603c06503ae750f88cf397e00796ea8'
Conflicts: nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix
Diffstat (limited to 'nixpkgs/pkgs/development/python-modules/qtile/default.nix')
-rw-r--r-- | nixpkgs/pkgs/development/python-modules/qtile/default.nix | 29 |
1 files changed, 19 insertions, 10 deletions
diff --git a/nixpkgs/pkgs/development/python-modules/qtile/default.nix b/nixpkgs/pkgs/development/python-modules/qtile/default.nix index 1d8aaa55ba6e..7e6d4a826eeb 100644 --- a/nixpkgs/pkgs/development/python-modules/qtile/default.nix +++ b/nixpkgs/pkgs/development/python-modules/qtile/default.nix @@ -5,13 +5,16 @@ , dbus-next , dbus-python , glib +, iwlib +, libdrm , libinput , libxkbcommon , mpd2 , pango +, pixman , pkg-config , psutil -, pulseaudio +, pulsectl-asyncio , pygobject3 , python-dateutil , pywayland @@ -22,19 +25,20 @@ , wayland , wlroots , xcbutilcursor +, xcbutilwm , xcffib , xkbcommon }: buildPythonPackage rec { pname = "qtile"; - version = "0.22.1"; + version = "0.23.0"; src = fetchFromGitHub { owner = "qtile"; repo = "qtile"; rev = "v${version}"; - hash = "sha256-HOyExVKOqZ4OeNM1/AiXQeiUV+EbSJLEjWEibm07ff8="; + hash = "sha256-WxnpkKqYGGEsFTt/1iCSiCzdESJP6HFJ6BztaMsMbYo="; }; patches = [ @@ -48,37 +52,42 @@ buildPythonPackage rec { --replace libpango-1.0.so.0 ${pango.out}/lib/libpango-1.0.so.0 substituteInPlace libqtile/backend/x11/xcursors.py \ --replace libxcb-cursor.so.0 ${xcbutilcursor.out}/lib/libxcb-cursor.so.0 + substituteInPlace libqtile/backend/wayland/cffi/build.py \ + --replace /usr/include/pixman-1 ${lib.getDev pixman}/include \ + --replace /usr/include/libdrm ${lib.getDev libdrm}/include/libdrm ''; SETUPTOOLS_SCM_PRETEND_VERSION = version; nativeBuildInputs = [ pkg-config - setuptools-scm setuptools + setuptools-scm ]; propagatedBuildInputs = [ - xcffib (cairocffi.override { withXcffib = true; }) - python-dateutil - dbus-python dbus-next + dbus-python + iwlib mpd2 psutil - pyxdg + pulsectl-asyncio pygobject3 + python-dateutil pywayland pywlroots + pyxdg + xcffib xkbcommon - pulseaudio ]; buildInputs = [ libinput + libxkbcommon wayland wlroots - libxkbcommon + xcbutilwm ]; doCheck = false; # Requires X server #TODO this can be worked out with the existing NixOS testing infrastructure. |