diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2020-03-14 11:02:07 +0100 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-03-15 13:48:22 +0100 |
commit | 7066dc85baa1cd1e6d4d8bf81a46c2fa8e4825fc (patch) | |
tree | 952f33d605a27c4366059b47913e9a2f6a2146dd /nixos/modules/services/misc/octoprint.nix | |
parent | 610da69d28166631b9a0259e54579d97956c5931 (diff) | |
download | nixpkgs-7066dc85baa1cd1e6d4d8bf81a46c2fa8e4825fc.tar nixpkgs-7066dc85baa1cd1e6d4d8bf81a46c2fa8e4825fc.tar.gz nixpkgs-7066dc85baa1cd1e6d4d8bf81a46c2fa8e4825fc.tar.bz2 nixpkgs-7066dc85baa1cd1e6d4d8bf81a46c2fa8e4825fc.tar.lz nixpkgs-7066dc85baa1cd1e6d4d8bf81a46c2fa8e4825fc.tar.xz nixpkgs-7066dc85baa1cd1e6d4d8bf81a46c2fa8e4825fc.tar.zst nixpkgs-7066dc85baa1cd1e6d4d8bf81a46c2fa8e4825fc.zip |
octoprint-plugins: use same python as octoprint, use overlays
- ensure the plugins use the same python as octoprint - overlay of overriding plugins - drop octoprint-plugins attribute
Diffstat (limited to 'nixos/modules/services/misc/octoprint.nix')
-rw-r--r-- | nixos/modules/services/misc/octoprint.nix | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/nixos/modules/services/misc/octoprint.nix b/nixos/modules/services/misc/octoprint.nix index 651ed374388..7a71d2c8c6a 100644 --- a/nixos/modules/services/misc/octoprint.nix +++ b/nixos/modules/services/misc/octoprint.nix @@ -17,9 +17,9 @@ let cfgUpdate = pkgs.writeText "octoprint-config.yaml" (builtins.toJSON fullConfig); - pluginsEnv = pkgs.python.buildEnv.override { - extraLibs = cfg.plugins pkgs.octoprint-plugins; - }; + pluginsEnv = package.python.withPackages (ps: [ps.octoprint] ++ (cfg.plugins ps)); + + package = pkgs.octoprint; in { @@ -106,7 +106,6 @@ in wantedBy = [ "multi-user.target" ]; after = [ "network.target" ]; path = [ pluginsEnv ]; - environment.PYTHONPATH = makeSearchPathOutput "lib" pkgs.python.sitePackages [ pluginsEnv ]; preStart = '' if [ -e "${cfg.stateDir}/config.yaml" ]; then @@ -119,7 +118,7 @@ in ''; serviceConfig = { - ExecStart = "${pkgs.octoprint}/bin/octoprint serve -b ${cfg.stateDir}"; + ExecStart = "${pluginsEnv}/bin/octoprint serve -b ${cfg.stateDir}"; User = cfg.user; Group = cfg.group; }; |