commit d8b94f5b2c1119b06d1be1b4f5e776dcb37978b1 · pyrox.dev/nixpkgs

+14 -2

nixos/modules/services/misc/klipper.nix

···

       23
       23
        
               description = lib.mdDoc "The Klipper package.";

     

       24
       24
        
             };

     

       25
       25
        
       

     

       26
       26
       +
             logFile = mkOption {

     

       27
       27
       +
               type = types.nullOr types.path;

     

       28
       28
       +
               default = null;

     

       29
       29
       +
               example = "/var/lib/klipper/klipper.log";

     

       30
       30
       +
               description = lib.mdDoc ''

     

       31
       31
       +
                 Path of the file Klipper should log to.

     

       32
       32
       +
                 If `null`, it logs to stdout, which is not recommended by upstream.

     

       33
       33
       +
               '';

     

       34
       34
       +
             };

     

       35
       35
       +
       

     

       26
       36
        
             inputTTY = mkOption {

     

       27
       37
        
               type = types.path;

     

       28
       38
        
               default = "/run/klipper/tty";

     
···

       151
       161
        
           systemd.services.klipper =

     

       152
       162
        
             let

     

       153
       163
        
               klippyArgs = "--input-tty=${cfg.inputTTY}"

     

       154
       154
       -
                 + optionalString (cfg.apiSocket != null) " --api-server=${cfg.apiSocket}";

     

       164
       164
       +
                 + optionalString (cfg.apiSocket != null) " --api-server=${cfg.apiSocket}"

     

       165
       165
       +
                 + optionalString (cfg.logFile != null) " --logfile=${cfg.logFile}"

     

       166
       166
       +
               ;

     

       155
       167
        
               printerConfigPath =

     

       156
       168
        
                 if cfg.mutableConfig

     

       157
       169
        
                 then cfg.mutableConfigFolder + "/printer.cfg"

     
···

       177
       189
        
               '';

     

       178
       190
        
       

     

       179
       191
        
               serviceConfig = {

     

       180
       180
       -
                 ExecStart = "${cfg.package}/lib/klipper/klippy.py ${klippyArgs} ${printerConfigPath}";

     

       192
       192
       +
                 ExecStart = "${cfg.package}/bin/klippy ${klippyArgs} ${printerConfigPath}";

     

       181
       193
        
                 RuntimeDirectory = "klipper";

     

       182
       194
        
                 StateDirectory = "klipper";

     

       183
       195
        
                 SupplementaryGroups = [ "dialout" ];

+7 -1

pkgs/servers/klipper/default.nix

···

       3
       3
        
       , fetchFromGitHub

     

       4
       4
        
       , python3

     

       5
       5
        
       , unstableGitUpdater

     

       6
       6
       +
       , makeWrapper

     

       6
       7
        
       }:

     

       7
       8
        
       

     

       8
       9
        
       stdenv.mkDerivation rec {

     
···

       19
       20
        
         sourceRoot = "source/klippy";

     

       20
       21
        
       

     

       21
       22
        
         # NB: This is needed for the postBuild step

     

       22
       22
       -
         nativeBuildInputs = [ (python3.withPackages ( p: with p; [ cffi ] )) ];

     

       23
       23
       +
         nativeBuildInputs = [

     

       24
       24
       +
           (python3.withPackages ( p: with p; [ cffi ] ))

     

       25
       25
       +
           makeWrapper

     

       26
       26
       +
         ];

     

       23
       27
        
       

     

       24
       28
        
         buildInputs = [ (python3.withPackages (p: with p; [ cffi pyserial greenlet jinja2 markupsafe numpy ])) ];

     

       25
       29
        
       

     
···

       49
       53
        
           cp -r $src/docs $out/lib/docs

     

       50
       54
        
           cp -r $src/config $out/lib/config

     

       51
       55
        
       

     

       56
       56
       +
           mkdir -p $out/bin

     

       52
       57
        
           chmod 755 $out/lib/klipper/klippy.py

     

       58
       58
       +
           makeWrapper $out/lib/klipper/klippy.py $out/bin/klippy --chdir $out/lib/klipper

     

       53
       59
        
           runHook postInstall

     

       54
       60
        
         '';

     

       55
       61