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

treewide: use default compiler for cuda

Browse Source
This commit is contained in:
Nikolay Amiantov 2017-10-16 03:34:16 +03:00
parent 85d3c00dce
commit 378bfba023
4 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/misc/blender/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, stdenv_gcc5, lib, fetchurl, boost, cmake, ffmpeg, gettext, glew
{ stdenv, lib, fetchurl, boost, cmake, ffmpeg, gettext, glew
, ilmbase, libXi, libX11, libXext, libXrender
, libjpeg, libpng, libsamplerate, libsndfile
, libtiff, mesa, openal, opencolorio, openexr, openimageio, openjpeg_1, python
@ -10,7 +10,7 @@
with lib;
(if cudaSupport then stdenv_gcc5 else stdenv).mkDerivation rec {
stdenv.mkDerivation rec {
name = "blender-2.79";
src = fetchurl {

4
pkgs/development/libraries/opencv/3.x.nix
View File

@ -16,7 +16,7 @@
, enableGStreamer ? false, gst_all_1
, enableEigen ? true, eigen
, enableOpenblas ? true, openblas
, enableCuda ? false, cudatoolkit, gcc5
, enableCuda ? false, cudatoolkit
, enableTesseract ? false, tesseract, leptonica
, AVFoundation, Cocoa, QTKit
}:
@ -145,7 +145,7 @@ stdenv.mkDerivation rec {
# simply enabled automatically if contrib is built, and it detects
# tesseract & leptonica.
++ lib.optionals enableTesseract [ tesseract leptonica ]
++ lib.optionals enableCuda [ cudatoolkit gcc5 ]
++ lib.optional enableCuda cudatoolkit
++ lib.optional buildContrib protobuf
++ lib.optionals stdenv.isDarwin [ AVFoundation Cocoa QTKit ];

4
pkgs/development/libraries/opensubdiv/default.nix
View File

@ -1,9 +1,9 @@
{ lib, stdenv, stdenv_gcc5, fetchurl, fetchFromGitHub, cmake, pkgconfig, xorg, mesa_glu
{ lib, stdenv, fetchurl, fetchFromGitHub, cmake, pkgconfig, xorg, mesa_glu
, mesa_noglu, glew, ocl-icd, python3
, cudaSupport ? false, cudatoolkit
}:
(if cudaSupport then stdenv_gcc5 else stdenv).mkDerivation rec {
stdenv.mkDerivation rec {
name = "opensubdiv-${version}";
version = "3.2.0";

2
pkgs/top-level/all-packages.nix
View File

@ -10076,7 +10076,6 @@ with pkgs;
};
opensubdiv = callPackage ../development/libraries/opensubdiv {
stdenv_gcc5 = overrideCC stdenv gcc5;
cudaSupport = config.cudaSupport or false;
cmake = cmake_2_8;
};
@ -13814,7 +13813,6 @@ with pkgs;
bleachbit = callPackage ../applications/misc/bleachbit { };
blender = callPackage ../applications/misc/blender {
stdenv_gcc5 = overrideCC stdenv gcc5;
cudaSupport = config.cudaSupport or false;
python = python35;
};