From 827f213fb29c346c8977cc70c3adc164e349ae10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 21 Mar 2021 18:24:14 +0100 Subject: flashfocus: don't use python3Packages.callPackage (#117027) Otherwise we can't override specific Python dependencies of it. --- pkgs/misc/flashfocus/default.nix | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) (limited to 'pkgs/misc/flashfocus') 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; -- cgit v1.2.3