From d0830178383056757ec0eca1cddc27b48dd57dc5 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 25 Mar 2021 11:58:47 +0100 Subject: [PATCH] curaByDagoma: use python2 --- pkgs/applications/misc/curabydagoma/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/curabydagoma/default.nix b/pkgs/applications/misc/curabydagoma/default.nix index 821b88f9b20..a8d041de107 100644 --- a/pkgs/applications/misc/curabydagoma/default.nix +++ b/pkgs/applications/misc/curabydagoma/default.nix @@ -1,4 +1,4 @@ -{ stdenv, runtimeShell, lib, fetchurl, python, pythonPackages, unzip }: +{ stdenv, runtimeShell, lib, fetchurl, python2Packages, unzip }: # This package uses a precompiled "binary" distribution of CuraByDagoma, # distributed by the editor. @@ -13,7 +13,9 @@ # I guess people owning a 3D printer generally don't use i686. # If, however, someone needs it, we certainly can find a solution. -stdenv.mkDerivation rec { +let + pythonPackages = python2Packages; +in stdenv.mkDerivation rec { pname = "curabydagoma"; # Version is the date, UNIX format version = "1520506579"; @@ -26,7 +28,7 @@ stdenv.mkDerivation rec { }; unpackCmd = "unzip $curSrc && tar zxf CuraByDagoma_amd64.tar.gz"; nativeBuildInputs = [ unzip ]; - buildInputs = [ python pythonPackages.pyopengl pythonPackages.wxPython pythonPackages.pyserial pythonPackages.numpy ]; + buildInputs = [ pythonPackages.python pythonPackages.pyopengl pythonPackages.wxPython pythonPackages.pyserial pythonPackages.numpy ]; # Compile all pyc files because the included pyc files may be older than the # py files. However, Python doesn't realize that because the packages @@ -46,7 +48,7 @@ stdenv.mkDerivation rec { cat > $out/bin/curabydago <