MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-17 07:13:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

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

Browse source
This commit is contained in:
Sandro 2023-06-13 11:37:12 +02:00 committed by GitHub
commit ddf174183e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 30 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
pkgs/applications/graphics/digikam/default.nix
View file

@ -1,4 +1,4 @@
{ mkDerivation, lib, fetchurl, cmake, doxygen, extra-cmake-modules, wrapGAppsHook
{ mkDerivation, config, lib, fetchurl, cmake, doxygen, extra-cmake-modules, wrapGAppsHook
# For `digitaglinktree`
, perl, sqlite
@ -52,6 +52,9 @@
, breeze-icons
, oxygen
, cudaSupport ? config.cudaSupport or false
, cudaPackages ? {}
}:
mkDerivation rec {
@ -63,7 +66,15 @@ mkDerivation rec {
sha256 = "sha256-o/MPAbfRttWFgivNXr+N9p4P8CRWOnJGLr+AadvaIuE=";
};
nativeBuildInputs = [ cmake doxygen extra-cmake-modules kdoctools wrapGAppsHook ];
nativeBuildInputs = [
cmake
doxygen
extra-cmake-modules
kdoctools
wrapGAppsHook
] ++ lib.optionals cudaSupport (with cudaPackages; [
cuda_nvcc
]);
buildInputs = [
bison
@ -109,7 +120,9 @@ mkDerivation rec {
marble
oxygen
threadweaver
];
] ++ lib.optionals cudaSupport (with cudaPackages; [
cuda_cudart
]);
cmakeFlags = [
"-DENABLE_MYSQLSUPPORT=1"

17
pkgs/development/libraries/mlt/qt-5.nix
View file

@ -1,4 +1,5 @@
{ lib
{ config
, lib
, fetchFromGitHub
, cmake
, SDL
@ -23,6 +24,8 @@
, rubberband
, mkDerivation
, which
, cudaSupport ? config.cudaSupport or false
, cudaPackages ? {}
}:
mkDerivation rec {
@ -55,9 +58,17 @@ mkDerivation rec {
ladspa-sdk
ladspaPlugins
rubberband
];
] ++ lib.optionals cudaSupport (with cudaPackages; [
cuda_cudart
]);
nativeBuildInputs = [ cmake which pkg-config ];
nativeBuildInputs = [
cmake
which
pkg-config
] ++ lib.optionals cudaSupport (with cudaPackages; [
cuda_nvcc
]);
outputs = [ "out" "dev" ];