public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

llvm_34: use python2

Browse Source
This commit is contained in:
Frederik Rietdijk
2016-11-24 22:28:03 +01:00
parent b1f60ba8cf
commit 7ab6edd171
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/compilers/llvm/3.4/lld.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetch, cmake, llvm, ncurses, zlib, python, version }: { stdenv, fetch, cmake, llvm, ncurses, zlib, python2, version }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "lld-${version}"; name = "lld-${version}";
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
export cmakeFlags="$cmakeFlags -DLLD_PATH_TO_LLVM_SOURCE="`ls -d $PWD/llvm-*` export cmakeFlags="$cmakeFlags -DLLD_PATH_TO_LLVM_SOURCE="`ls -d $PWD/llvm-*`
''; '';
buildInputs = [ cmake ncurses zlib python ]; buildInputs = [ cmake ncurses zlib python2 ];
cmakeFlags = [ cmakeFlags = [
"-DCMAKE_CXX_FLAGS=-std=c++11" "-DCMAKE_CXX_FLAGS=-std=c++11"
pkgs/development/compilers/llvm/3.4/lldb.nix
+2 -2
View File
@@ -8,7 +8,7 @@
, libedit , libedit
, llvm , llvm
, clang , clang
, python , python2
, version , version
}: }:
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
scripts/Python/build-swig-Python.sh scripts/Python/build-swig-Python.sh
''; '';
buildInputs = [ cmake python which swig ncurses zlib libedit ]; buildInputs = [ cmake python2 which swig ncurses zlib libedit ];
cmakeFlags = [ cmakeFlags = [
"-DCMAKE_CXX_FLAGS=-std=c++11" "-DCMAKE_CXX_FLAGS=-std=c++11"
pkgs/development/compilers/llvm/3.4/llvm.nix
+2 -2
View File
@@ -3,7 +3,7 @@
, perl , perl
, groff , groff
, cmake , cmake
, python , python2
, libffi , libffi
, binutils , binutils
, libxml2 , libxml2
@@ -30,7 +30,7 @@ in stdenv.mkDerivation rec {
buildInputs = buildInputs =
[ perl groff cmake libxml2 libffi ] [ perl groff cmake libxml2 libffi ]
++ stdenv.lib.optional (!stdenv.isDarwin) python /* ++ stdenv.lib.optional (!stdenv.isDarwin) python2 /*
++ stdenv.lib.optional stdenv.isLinux valgrind */; ++ stdenv.lib.optional stdenv.isLinux valgrind */;
propagatedBuildInputs = [ ncurses zlib ]; propagatedBuildInputs = [ ncurses zlib ];
pkgs/development/compilers/llvm/3.4/polly.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetch, cmake, isl, python, gmp, llvm, version }: { stdenv, fetch, cmake, isl, python2, gmp, llvm, version }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "polly-${version}"; name = "polly-${version}";
@@ -7,7 +7,7 @@ stdenv.mkDerivation {
patches = [ ./polly-separate-build.patch ]; patches = [ ./polly-separate-build.patch ];
buildInputs = [ cmake isl python gmp ]; buildInputs = [ cmake isl python2 gmp ];
cmakeFlags = [ cmakeFlags = [
"-DCMAKE_CXX_FLAGS=-std=c++11" "-DCMAKE_CXX_FLAGS=-std=c++11"