From d8646a704e06c298738eab6bdc9e0361a98d816b Mon Sep 17 00:00:00 2001 From: Sandro Date: Tue, 20 Sep 2022 13:51:27 +0200 Subject: [PATCH] klipper: patchPhase -> postPatch, little cleanups --- pkgs/servers/klipper/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/klipper/default.nix b/pkgs/servers/klipper/default.nix index cc2f635e620..3ca708e5f4e 100644 --- a/pkgs/servers/klipper/default.nix +++ b/pkgs/servers/klipper/default.nix @@ -4,6 +4,7 @@ , python3 , unstableGitUpdater }: + stdenv.mkDerivation rec { pname = "klipper"; version = "unstable-2022-09-11"; @@ -23,13 +24,14 @@ stdenv.mkDerivation rec { buildInputs = [ (python3.withPackages (p: with p; [ cffi pyserial greenlet jinja2 markupsafe ])) ]; # we need to run this to prebuild the chelper. - postBuild = "python ./chelper/__init__.py"; + postBuild = '' + python ./chelper/__init__.py + ''; - # 2022-06-28: Python 3 is already supported in klipper, alas shebangs remained - # the same - we replace them in patchPhase. - patchPhase = '' - for F in klippy.py console.py parsedump.py; do - substituteInPlace $F \ + # Python 3 is already supported but shebangs aren't updated yet + postPatch = '' + for file in klippy.py console.py parsedump.py; do + substituteInPlace $file \ --replace '/usr/bin/env python2' '/usr/bin/env python' done '';