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