diff options
author | Joel <joel@joel.tokyo> | 2022-01-13 13:14:01 +1000 |
---|---|---|
committer | Joel <joel@joel.tokyo> | 2022-01-13 14:21:41 +1000 |
commit | 10c0cf6e4f20986b90346570846b5d1f723c6b6d (patch) | |
tree | d077c60e9ce58b3b51c630e43309e4869598b448 /pkgs/applications/window-managers/qtile/default.nix | |
parent | 38ec35cef2cb86fef8f65f61fefca3992666c2c3 (diff) |
qtile: cleanup
Diffstat (limited to 'pkgs/applications/window-managers/qtile/default.nix')
-rw-r--r-- | pkgs/applications/window-managers/qtile/default.nix | 30 |
1 files changed, 11 insertions, 19 deletions
diff --git a/pkgs/applications/window-managers/qtile/default.nix b/pkgs/applications/window-managers/qtile/default.nix index 8c5d65d4978f4..2bd92ee6cf663 100644 --- a/pkgs/applications/window-managers/qtile/default.nix +++ b/pkgs/applications/window-managers/qtile/default.nix @@ -1,15 +1,7 @@ -{ lib, fetchFromGitHub, python3, mypy, glib, cairo, pango, pkg-config, libxcb, xcbutilcursor }: +{ lib, fetchFromGitHub, python3, python3Packages, mypy, glib, pango, pkg-config, xcbutilcursor }: let - enabled-xcffib = cairocffi-xcffib: cairocffi-xcffib.override { - withXcffib = true; - }; - - # make it easier to reference python - python = python3; - pythonPackages = python.pkgs; - - unwrapped = pythonPackages.buildPythonPackage rec { + unwrapped = python3Packages.buildPythonPackage rec { pname = "qtile"; version = "0.19.0"; @@ -33,13 +25,13 @@ let nativeBuildInputs = [ pkg-config - ] ++ (with pythonPackages; [ + ] ++ (with python3Packages; [ setuptools-scm ]); - propagatedBuildInputs = with pythonPackages; [ + propagatedBuildInputs = with python3Packages; [ xcffib - (enabled-xcffib cairocffi) + (cairocffi.override { withXcffib = true; }) setuptools python-dateutil dbus-python @@ -68,9 +60,9 @@ let }; }; in - (python.withPackages (ps: [ unwrapped ])).overrideAttrs (_: { - # otherwise will be exported as "env", this restores `nix search` behavior - name = "${unwrapped.pname}-${unwrapped.version}"; - # export underlying qtile package - passthru = { inherit unwrapped; }; - }) +(python3.withPackages (_: [ unwrapped ])).overrideAttrs (_: { + # otherwise will be exported as "env", this restores `nix search` behavior + name = "${unwrapped.pname}-${unwrapped.version}"; + # export underlying qtile package + passthru = { inherit unwrapped; }; +}) |