python3Packages.qtile: 0.22.1 -> 0.23.0
- Updated version and hash - Added pulsectl-asyncio dependency and removed pulseaudio as those FFI bindings are now handled by pulsectl-asyncio - Added libdrm and pixman patches - Added xcbutilwm otherwise we get a header not found - Removed wlroots 0.15 pin as qtile now uses wlroots 0.16
This commit is contained in:
parent
fbba24df23
commit
80ab54b3af
|
@ -5,13 +5,15 @@
|
||||||
, dbus-next
|
, dbus-next
|
||||||
, dbus-python
|
, dbus-python
|
||||||
, glib
|
, glib
|
||||||
|
, libdrm
|
||||||
, libinput
|
, libinput
|
||||||
, libxkbcommon
|
, libxkbcommon
|
||||||
, mpd2
|
, mpd2
|
||||||
, pango
|
, pango
|
||||||
|
, pixman
|
||||||
, pkg-config
|
, pkg-config
|
||||||
, psutil
|
, psutil
|
||||||
, pulseaudio
|
, pulsectl-asyncio
|
||||||
, pygobject3
|
, pygobject3
|
||||||
, python-dateutil
|
, python-dateutil
|
||||||
, pywayland
|
, pywayland
|
||||||
|
@ -22,19 +24,20 @@
|
||||||
, wayland
|
, wayland
|
||||||
, wlroots
|
, wlroots
|
||||||
, xcbutilcursor
|
, xcbutilcursor
|
||||||
|
, xcbutilwm
|
||||||
, xcffib
|
, xcffib
|
||||||
, xkbcommon
|
, xkbcommon
|
||||||
}:
|
}:
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "qtile";
|
pname = "qtile";
|
||||||
version = "0.22.1";
|
version = "0.23.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "qtile";
|
owner = "qtile";
|
||||||
repo = "qtile";
|
repo = "qtile";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
hash = "sha256-HOyExVKOqZ4OeNM1/AiXQeiUV+EbSJLEjWEibm07ff8=";
|
hash = "sha256-WxnpkKqYGGEsFTt/1iCSiCzdESJP6HFJ6BztaMsMbYo=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
|
@ -48,6 +51,9 @@ buildPythonPackage rec {
|
||||||
--replace libpango-1.0.so.0 ${pango.out}/lib/libpango-1.0.so.0
|
--replace libpango-1.0.so.0 ${pango.out}/lib/libpango-1.0.so.0
|
||||||
substituteInPlace libqtile/backend/x11/xcursors.py \
|
substituteInPlace libqtile/backend/x11/xcursors.py \
|
||||||
--replace libxcb-cursor.so.0 ${xcbutilcursor.out}/lib/libxcb-cursor.so.0
|
--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;
|
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||||
|
@ -66,12 +72,12 @@ buildPythonPackage rec {
|
||||||
dbus-next
|
dbus-next
|
||||||
mpd2
|
mpd2
|
||||||
psutil
|
psutil
|
||||||
|
pulsectl-asyncio
|
||||||
pyxdg
|
pyxdg
|
||||||
pygobject3
|
pygobject3
|
||||||
pywayland
|
pywayland
|
||||||
pywlroots
|
pywlroots
|
||||||
xkbcommon
|
xkbcommon
|
||||||
pulseaudio
|
|
||||||
];
|
];
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
|
@ -79,6 +85,7 @@ buildPythonPackage rec {
|
||||||
wayland
|
wayland
|
||||||
wlroots
|
wlroots
|
||||||
libxkbcommon
|
libxkbcommon
|
||||||
|
xcbutilwm
|
||||||
];
|
];
|
||||||
|
|
||||||
doCheck = false; # Requires X server #TODO this can be worked out with the existing NixOS testing infrastructure.
|
doCheck = false; # Requires X server #TODO this can be worked out with the existing NixOS testing infrastructure.
|
||||||
|
|
|
@ -11042,7 +11042,7 @@ self: super: with self; {
|
||||||
qtconsole = callPackage ../development/python-modules/qtconsole { };
|
qtconsole = callPackage ../development/python-modules/qtconsole { };
|
||||||
|
|
||||||
qtile = callPackage ../development/python-modules/qtile {
|
qtile = callPackage ../development/python-modules/qtile {
|
||||||
wlroots = pkgs.wlroots_0_15;
|
wlroots = pkgs.wlroots_0_16;
|
||||||
};
|
};
|
||||||
qtile-extras = callPackage ../development/python-modules/qtile-extras { };
|
qtile-extras = callPackage ../development/python-modules/qtile-extras { };
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue