diff options
| author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2016-02-23 16:02:10 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2016-02-23 16:02:10 +0100 |
| commit | 40ca841c5c0b264a0d1a1ffc2f912e17e30f9caa (patch) | |
| tree | 5172f6511291bf6daf7a7f228f29f16b30de6fb8 /pkgs/applications/misc/octoprint | |
| parent | b1c8fb8685311bff0f0db439650bbe8ecaf89e9c (diff) | |
| parent | 4d06bf70f4580d5cb907278dd3c384c305f95c74 (diff) | |
| download | nixlib-40ca841c5c0b264a0d1a1ffc2f912e17e30f9caa.tar nixlib-40ca841c5c0b264a0d1a1ffc2f912e17e30f9caa.tar.gz nixlib-40ca841c5c0b264a0d1a1ffc2f912e17e30f9caa.tar.bz2 nixlib-40ca841c5c0b264a0d1a1ffc2f912e17e30f9caa.tar.lz nixlib-40ca841c5c0b264a0d1a1ffc2f912e17e30f9caa.tar.xz nixlib-40ca841c5c0b264a0d1a1ffc2f912e17e30f9caa.tar.zst nixlib-40ca841c5c0b264a0d1a1ffc2f912e17e30f9caa.zip | |
Merge pull request #13124 from FRidh/buildPythonApplication
buildPythonApplication: use new function for Python applications
Diffstat (limited to 'pkgs/applications/misc/octoprint')
| -rw-r--r-- | pkgs/applications/misc/octoprint/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/applications/misc/octoprint/plugins.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix index 3e8b35ba4350..67b351ba906e 100644 --- a/pkgs/applications/misc/octoprint/default.nix +++ b/pkgs/applications/misc/octoprint/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, pythonPackages }: -pythonPackages.buildPythonPackage rec { +pythonPackages.buildPythonApplication rec { name = "OctoPrint-${version}"; version = "1.2.9"; diff --git a/pkgs/applications/misc/octoprint/plugins.nix b/pkgs/applications/misc/octoprint/plugins.nix index a0c458baa967..9b5a9ef15012 100644 --- a/pkgs/applications/misc/octoprint/plugins.nix +++ b/pkgs/applications/misc/octoprint/plugins.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, octoprint, pythonPackages }: let - buildPlugin = args: pythonPackages.buildPythonPackage (args // { + buildPlugin = args: pythonPackages.buildPythonApplication (args // { buildInputs = (args.buildInputs or []) ++ [ octoprint ]; }); in { |