nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-28 01:43:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #154839 from jyooru/cleanup/qtile

Browse Source
This commit is contained in:
legendofmiracles 2022-01-25 07:04:54 -06:00 committed by GitHub
commit 8479908fd8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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
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; };
})

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

@ -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 { };