k3d: stay with python2
not tested whether python3 works
This commit is contained in:
parent
41faf39bf5
commit
9070c34cd1
|
@ -1,5 +1,5 @@
|
||||||
{ lib, stdenv, fetchFromGitHub, fetchpatch, ftgl, glew, asciidoc
|
{ 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
|
, libpng, boost, doxygen, cairomm, pkg-config, libjpeg, libtiff
|
||||||
, gettext, intltool, perl, gtkmm2, glibmm, gtkglext, libXmu }:
|
, gettext, intltool, perl, gtkmm2, glibmm, gtkglext, libXmu }:
|
||||||
|
|
||||||
|
@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
|
||||||
nativeBuildInputs = [ cmake ninja gettext intltool doxygen pkg-config perl asciidoc ];
|
nativeBuildInputs = [ cmake ninja gettext intltool doxygen pkg-config perl asciidoc ];
|
||||||
|
|
||||||
buildInputs = [
|
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
|
boost cairomm libjpeg libtiff
|
||||||
ftgl glew gtkmm2 glibmm gtkglext libXmu
|
ftgl glew gtkmm2 glibmm gtkglext libXmu
|
||||||
];
|
];
|
||||||
|
|
|
@ -25150,6 +25150,7 @@ in
|
||||||
stdenv = gcc6Stdenv;
|
stdenv = gcc6Stdenv;
|
||||||
boost = boost155.override {
|
boost = boost155.override {
|
||||||
enablePython = true;
|
enablePython = true;
|
||||||
|
python = python2;
|
||||||
stdenv = gcc6Stdenv;
|
stdenv = gcc6Stdenv;
|
||||||
buildPackages = buildPackages // {
|
buildPackages = buildPackages // {
|
||||||
stdenv = gcc6Stdenv;
|
stdenv = gcc6Stdenv;
|
||||||
|
|
Loading…
Reference in a new issue