diff options
Diffstat (limited to 'pkgs/development/python-modules/qtile')
-rw-r--r-- | pkgs/development/python-modules/qtile/default.nix | 104 | ||||
-rw-r--r-- | pkgs/development/python-modules/qtile/wrapper.nix | 8 |
2 files changed, 57 insertions, 55 deletions
diff --git a/pkgs/development/python-modules/qtile/default.nix b/pkgs/development/python-modules/qtile/default.nix index 6dc9cc0119436..6baaa6c47da2d 100644 --- a/pkgs/development/python-modules/qtile/default.nix +++ b/pkgs/development/python-modules/qtile/default.nix @@ -1,46 +1,48 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, cairocffi -, dbus-next -, dbus-python -, glib -, iwlib -, libdrm -, libinput -, libxkbcommon -, mpd2 -, pango -, pixman -, pkg-config -, psutil -, pulsectl-asyncio -, pygobject3 -, python-dateutil -, pywayland -, pywlroots -, pyxdg -, setuptools -, setuptools-scm -, wayland -, wlroots -, xcbutilcursor -, xcbutilwm -, xcffib -, xkbcommon -, nixosTests +{ + lib, + buildPythonPackage, + fetchFromGitHub, + cairocffi, + dbus-next, + glib, + iwlib, + libcst, + libdrm, + libinput, + libxkbcommon, + mpd2, + pango, + pixman, + pkg-config, + psutil, + pulsectl-asyncio, + pygobject3, + pytz, + pywayland, + pywlroots, + pyxdg, + setuptools, + setuptools-scm, + wayland, + wlroots, + xcbutilcursor, + xcbutilwm, + xcffib, + xkbcommon, + nixosTests, + extraPackages ? [ ], }: buildPythonPackage rec { pname = "qtile"; - version = "0.25.0"; - format = "setuptools"; + version = "0.28.1"; + pyproject = true; src = fetchFromGitHub { owner = "qtile"; repo = "qtile"; rev = "refs/tags/v${version}"; - hash = "sha256-j5hpXfUSDUT9nBr6CafIzqdTYQxSWok+ZlQA7bGdVvk="; + hash = "sha256-r8cAht40r1/6rG1xrfx34YEPuPeyBCuSvX7MarLTTCc="; }; patches = [ @@ -49,32 +51,32 @@ buildPythonPackage rec { postPatch = '' substituteInPlace libqtile/pangocffi.py \ - --replace libgobject-2.0.so.0 ${glib.out}/lib/libgobject-2.0.so.0 \ - --replace libpangocairo-1.0.so.0 ${pango.out}/lib/libpangocairo-1.0.so.0 \ - --replace libpango-1.0.so.0 ${pango.out}/lib/libpango-1.0.so.0 + --replace-fail libgobject-2.0.so.0 ${glib.out}/lib/libgobject-2.0.so.0 \ + --replace-fail libpangocairo-1.0.so.0 ${pango.out}/lib/libpangocairo-1.0.so.0 \ + --replace-fail 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 + --replace-fail 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 + --replace-fail /usr/include/pixman-1 ${lib.getDev pixman}/include \ + --replace-fail /usr/include/libdrm ${lib.getDev libdrm}/include/libdrm ''; - nativeBuildInputs = [ - pkg-config + build-system = [ setuptools setuptools-scm + pkg-config ]; - propagatedBuildInputs = [ + dependencies = extraPackages ++ [ (cairocffi.override { withXcffib = true; }) dbus-next - dbus-python iwlib + libcst mpd2 psutil pulsectl-asyncio pygobject3 - python-dateutil + pytz pywayland pywlroots pyxdg @@ -96,12 +98,20 @@ buildPythonPackage rec { providedSessions = [ "qtile" ]; }; + postInstall = '' + install resources/qtile.desktop -Dt $out/share/xsessions + install resources/qtile-wayland.desktop -Dt $out/share/wayland-sessions + ''; + meta = with lib; { homepage = "http://www.qtile.org/"; license = licenses.mit; - description = "A small, flexible, scriptable tiling window manager written in Python"; + description = "Small, flexible, scriptable tiling window manager written in Python"; mainProgram = "qtile"; platforms = platforms.linux; - maintainers = with maintainers; [ arjan-s ]; + maintainers = with maintainers; [ + arjan-s + sigmanificient + ]; }; } diff --git a/pkgs/development/python-modules/qtile/wrapper.nix b/pkgs/development/python-modules/qtile/wrapper.nix deleted file mode 100644 index b4f6e4c2e23b2..0000000000000 --- a/pkgs/development/python-modules/qtile/wrapper.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ python3 }: - -(python3.withPackages (_: [ python3.pkgs.qtile ])).overrideAttrs (_: { - # restore some qtile attrs, beautify name - inherit (python3.pkgs.qtile) pname version meta; - name = with python3.pkgs.qtile; "${pname}-${version}"; - passthru.unwrapped = python3.pkgs.qtile; -}) |