dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

qtile: cleanup

Browse Source
This commit is contained in:
Joel 2022-01-13 13:14:01 +10:00
parent 38ec35cef2
commit 10c0cf6e4f
No known key found for this signature in database
GPG Key ID: 18550BD205E9EF64
2 changed files with 12 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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 let
enabled-xcffib = cairocffi-xcffib: cairocffi-xcffib.override { unwrapped = python3Packages.buildPythonPackage rec {
withXcffib = true;
};
# make it easier to reference python
python = python3;
pythonPackages = python.pkgs;
unwrapped = pythonPackages.buildPythonPackage rec {
pname = "qtile"; pname = "qtile";
version = "0.19.0"; version = "0.19.0";
@ -33,13 +25,13 @@ let
nativeBuildInputs = [ nativeBuildInputs = [
pkg-config pkg-config
] ++ (with pythonPackages; [ ] ++ (with python3Packages; [
setuptools-scm setuptools-scm
]); ]);
propagatedBuildInputs = with pythonPackages; [ propagatedBuildInputs = with python3Packages; [
xcffib xcffib
(enabled-xcffib cairocffi) (cairocffi.override { withXcffib = true; })
setuptools setuptools
python-dateutil python-dateutil
dbus-python dbus-python
@ -68,9 +60,9 @@ let
}; };
}; };
in in
(python.withPackages (ps: [ unwrapped ])).overrideAttrs (_: { (python3.withPackages (_: [ unwrapped ])).overrideAttrs (_: {
# otherwise will be exported as "env", this restores `nix search` behavior # otherwise will be exported as "env", this restores `nix search` behavior
name = "${unwrapped.pname}-${unwrapped.version}"; name = "${unwrapped.pname}-${unwrapped.version}";
# export underlying qtile package # export underlying qtile package
passthru = { inherit unwrapped; }; passthru = { inherit unwrapped; };
}) })

4
pkgs/top-level/all-packages.nix
View File

@ -29220,9 +29220,7 @@ with pkgs;
qpdfview = libsForQt5.callPackage ../applications/misc/qpdfview {}; qpdfview = libsForQt5.callPackage ../applications/misc/qpdfview {};
qtile = callPackage ../applications/window-managers/qtile { qtile = callPackage ../applications/window-managers/qtile { };
inherit (xorg) libxcb;
};
vimpc = callPackage ../applications/audio/vimpc { }; vimpc = callPackage ../applications/audio/vimpc { };