pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #234731 from aidalgol/gui-apps-with-cuda-fixes

authored by

Sandro and committed by
GitHub ddf17418 9183a72d

+30 -6
unified split
+16 -3
pkgs/applications/graphics/digikam/default.nix
··· 1 - { mkDerivation, lib, fetchurl, cmake, doxygen, extra-cmake-modules, wrapGAppsHook 2 3 # For `digitaglinktree` 4 , perl, sqlite ··· 52 53 , breeze-icons 54 , oxygen 55 }: 56 57 mkDerivation rec { ··· 63 sha256 = "sha256-o/MPAbfRttWFgivNXr+N9p4P8CRWOnJGLr+AadvaIuE="; 64 }; 65 66 - nativeBuildInputs = [ cmake doxygen extra-cmake-modules kdoctools wrapGAppsHook ]; 67 68 buildInputs = [ 69 bison ··· 109 marble 110 oxygen 111 threadweaver 112 - ]; 113 114 cmakeFlags = [ 115 "-DENABLE_MYSQLSUPPORT=1"
··· 1 + { mkDerivation, config, lib, fetchurl, cmake, doxygen, extra-cmake-modules, wrapGAppsHook 2 3 # For `digitaglinktree` 4 , perl, sqlite ··· 52 53 , breeze-icons 54 , oxygen 55 + 56 + , cudaSupport ? config.cudaSupport or false 57 + , cudaPackages ? {} 58 }: 59 60 mkDerivation rec { ··· 66 sha256 = "sha256-o/MPAbfRttWFgivNXr+N9p4P8CRWOnJGLr+AadvaIuE="; 67 }; 68 69 + nativeBuildInputs = [ 70 + cmake 71 + doxygen 72 + extra-cmake-modules 73 + kdoctools 74 + wrapGAppsHook 75 + ] ++ lib.optionals cudaSupport (with cudaPackages; [ 76 + cuda_nvcc 77 + ]); 78 79 buildInputs = [ 80 bison ··· 120 marble 121 oxygen 122 threadweaver 123 + ] ++ lib.optionals cudaSupport (with cudaPackages; [ 124 + cuda_cudart 125 + ]); 126 127 cmakeFlags = [ 128 "-DENABLE_MYSQLSUPPORT=1"
+14 -3
pkgs/development/libraries/mlt/qt-5.nix
··· 1 - { lib 2 , fetchFromGitHub 3 , cmake 4 , SDL ··· 23 , rubberband 24 , mkDerivation 25 , which 26 }: 27 28 mkDerivation rec { ··· 55 ladspa-sdk 56 ladspaPlugins 57 rubberband 58 - ]; 59 60 - nativeBuildInputs = [ cmake which pkg-config ]; 61 62 outputs = [ "out" "dev" ]; 63
··· 1 + { config 2 + , lib 3 , fetchFromGitHub 4 , cmake 5 , SDL ··· 24 , rubberband 25 , mkDerivation 26 , which 27 + , cudaSupport ? config.cudaSupport or false 28 + , cudaPackages ? {} 29 }: 30 31 mkDerivation rec { ··· 58 ladspa-sdk 59 ladspaPlugins 60 rubberband 61 + ] ++ lib.optionals cudaSupport (with cudaPackages; [ 62 + cuda_cudart 63 + ]); 64 65 + nativeBuildInputs = [ 66 + cmake 67 + which 68 + pkg-config 69 + ] ++ lib.optionals cudaSupport (with cudaPackages; [ 70 + cuda_nvcc 71 + ]); 72 73 outputs = [ "out" "dev" ]; 74