diff options
author | Robert Schütz <dev@schuetz-co.de> | 2021-03-21 18:24:14 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-03-21 18:24:14 +0100 |
commit | 827f213fb29c346c8977cc70c3adc164e349ae10 (patch) | |
tree | 81122215b9eb67d374306e31a324997bdc337876 | |
parent | c82066e585bb59ea72a0ff842d66936711f57e4f (diff) |
flashfocus: don't use python3Packages.callPackage (#117027)
Otherwise we can't override specific Python dependencies of it.
-rw-r--r-- | pkgs/misc/flashfocus/default.nix | 22 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 17 insertions, 7 deletions
diff --git a/pkgs/misc/flashfocus/default.nix b/pkgs/misc/flashfocus/default.nix index 98f368132a91..2b645817a7e5 100644 --- a/pkgs/misc/flashfocus/default.nix +++ b/pkgs/misc/flashfocus/default.nix @@ -1,17 +1,27 @@ -{ lib, buildPythonApplication, fetchPypi, xcffib, pyyaml, click, i3ipc, marshmallow, cffi, xpybutil, pytestrunner }: +{ lib, python3 }: - -buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "flashfocus"; version = "2.2.2"; - src = fetchPypi { + src = python3.pkgs.fetchPypi { inherit pname version; sha256 = "1z20d596rnc7cs0rrd221gjn14dmbr11djv94y9p4v7rr788sswv"; }; - nativeBuildInputs = [ pytestrunner ]; - propagatedBuildInputs = [ i3ipc xcffib click cffi xpybutil marshmallow pyyaml ]; + nativeBuildInputs = with python3.pkgs; [ + pytestrunner + ]; + + propagatedBuildInputs = with python3.pkgs; [ + i3ipc + xcffib + click + cffi + xpybutil + marshmallow + pyyaml + ]; # Tests require access to a X session doCheck = false; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c672464d4f7d..58670a933508 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2408,7 +2408,7 @@ in fuzzel = callPackage ../applications/misc/fuzzel { }; - flashfocus = python3Packages.callPackage ../misc/flashfocus { }; + flashfocus = callPackage ../misc/flashfocus { }; qt-video-wlr = libsForQt5.callPackage ../applications/misc/qt-video-wlr { }; |