From 9070c34cd1f26a79faae3939e53cc966190d9628 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 27 Jul 2021 16:20:02 +0200 Subject: [PATCH] k3d: stay with python2 not tested whether python3 works --- pkgs/applications/graphics/k3d/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/k3d/default.nix b/pkgs/applications/graphics/k3d/default.nix index 99e56738dbf..68e28c5cc88 100644 --- a/pkgs/applications/graphics/k3d/default.nix +++ b/pkgs/applications/graphics/k3d/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, fetchpatch, ftgl, glew, asciidoc -, cmake, ninja, libGLU, libGL, zlib, python, expat, libxml2, libsigcxx, libuuid, freetype +, cmake, ninja, libGLU, libGL, zlib, python2, expat, libxml2, libsigcxx, libuuid, freetype , libpng, boost, doxygen, cairomm, pkg-config, libjpeg, libtiff , gettext, intltool, perl, gtkmm2, glibmm, gtkglext, libXmu }: @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ninja gettext intltool doxygen pkg-config perl asciidoc ]; buildInputs = [ - libGLU libGL zlib python expat libxml2 libsigcxx libuuid freetype libpng + libGLU libGL zlib python2 expat libxml2 libsigcxx libuuid freetype libpng boost cairomm libjpeg libtiff ftgl glew gtkmm2 glibmm gtkglext libXmu ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ae759eea2bf..ac848e602d3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25150,6 +25150,7 @@ in stdenv = gcc6Stdenv; boost = boost155.override { enablePython = true; + python = python2; stdenv = gcc6Stdenv; buildPackages = buildPackages // { stdenv = gcc6Stdenv;