mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-10-30 16:10:36 +00:00
pixinsight: drop cudaSupport, add extraPkgs
Drop cudaSupport: since 1.9.5 bundled modules don't need any extra packages for CUDA support, so cudatoolkit in targetPkgs is not needed for built-in functionality Add more flexible extraPkgs to extend targetPkgs instead: some third-party plugins do need extra libraries in FHS env (e.g. RC Astro plugins need cuda_nvrtc for GPU acceleration)
This commit is contained in:
@@ -2,8 +2,7 @@
|
||||
lib,
|
||||
callPackage,
|
||||
buildFHSEnv,
|
||||
config,
|
||||
cudaSupport ? config.cudaSupport,
|
||||
extraPkgs ? pkgs: [ ], # extra packages to add to targetPkgs
|
||||
|
||||
# Provide support for built-in self-updates and plugin management
|
||||
#
|
||||
@@ -37,7 +36,8 @@ buildFHSEnv {
|
||||
|
||||
targetPkgs =
|
||||
pkgs:
|
||||
(with pkgs; [
|
||||
with pkgs;
|
||||
[
|
||||
expat
|
||||
glib
|
||||
zlib
|
||||
@@ -93,13 +93,8 @@ buildFHSEnv {
|
||||
libxcb-render-util
|
||||
libxcb-wm
|
||||
# libxcb-cursor # Bundled by PixInsight
|
||||
])
|
||||
++ lib.optionals cudaSupport (
|
||||
with pkgs.cudaPackages;
|
||||
[
|
||||
cudatoolkit
|
||||
]
|
||||
);
|
||||
]
|
||||
++ extraPkgs pkgs;
|
||||
|
||||
extraInstallCommands = ''
|
||||
# Provide second binary matching upstream CLI command (`PixInsight`)
|
||||
|
||||
Reference in New Issue
Block a user