Merge pull request #154839 from jyooru/cleanup/qtile
This commit is contained in:
commit
8479908fd8
|
@ -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; };
|
||||
})
|
||||
|
|
|
@ -29329,9 +29329,7 @@ with pkgs;
|
|||
|
||||
qpdfview = libsForQt5.callPackage ../applications/misc/qpdfview {};
|
||||
|
||||
qtile = callPackage ../applications/window-managers/qtile {
|
||||
inherit (xorg) libxcb;
|
||||
};
|
||||
qtile = callPackage ../applications/window-managers/qtile { };
|
||||
|
||||
vimpc = callPackage ../applications/audio/vimpc { };
|
||||
|
||||
|
|
Loading…
Reference in a new issue