diff options
| author | Jonathan Ringer <jonringer117@gmail.com> | 2021-11-21 14:40:40 -0800 |
|---|---|---|
| committer | Jonathan Ringer <jonringer117@gmail.com> | 2021-11-21 14:40:40 -0800 |
| commit | 09e494f4c296b29755fb8639e3f751f6aa706a45 (patch) | |
| tree | 1f1ff77e46b78c8d91808fef8405361366867dd4 /pkgs/tools/misc/qmk/default.nix | |
| parent | 6b8044795e4b7ff99b96259a4a6b09eb9380703d (diff) | |
| parent | b2181bc967053310657128d687e44ec683e7604b (diff) | |
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
pkgs/applications/window-managers/sway/default.nix
Diffstat (limited to 'pkgs/tools/misc/qmk/default.nix')
| -rw-r--r-- | pkgs/tools/misc/qmk/default.nix | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/pkgs/tools/misc/qmk/default.nix b/pkgs/tools/misc/qmk/default.nix index ef25a7361c26..5067e1e0fabe 100644 --- a/pkgs/tools/misc/qmk/default.nix +++ b/pkgs/tools/misc/qmk/default.nix @@ -1,16 +1,12 @@ -{ lib, python3, fetchpatch, writeText }: +{ lib +, python3 +}: -let - inherit (python3.pkgs) buildPythonApplication fetchPypi; - setuppy = writeText "setup.py" '' - from setuptools import setup - setup() - ''; -in buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "qmk"; version = "1.0.0"; - src = fetchPypi { + src = python3.pkgs.fetchPypi { inherit pname version; sha256 = "sha256-2mLuxzxFSMw3sLm+OTcgLcOjAdwvJmNhDsynUaYQ+co="; }; @@ -36,8 +32,12 @@ in buildPythonApplication rec { pyusb ]; + # buildPythonApplication requires setup.py; the setup.py file crafted below + # acts as a wrapper to setup.cfg postConfigure = '' - cp ${setuppy} setup.py + touch setup.py + echo "from setuptools import setup" >> setup.py + echo "setup()" >> setup.py ''; # no tests implemented |