diff options
| author | Someone <else@someonex.net> | 2024-05-25 12:18:36 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-25 12:18:36 +0000 |
| commit | ee12cdd925f30b96027b0a1ceba472164fbd7c02 (patch) | |
| tree | 031c425d526e65bdd4580b008a3404ff7b38b769 /pkgs/by-name/no | |
| parent | ae1ff88daebb6a964fa503e483019a1d1b430bab (diff) | |
| parent | bfa1038277d0dea0037de82ec010a7ace46f15ea (diff) | |
Merge pull request #314186 from CHN-beta/fix-nomacs
nomacs: fix build with CUDA support
Diffstat (limited to 'pkgs/by-name/no')
| -rw-r--r-- | pkgs/by-name/no/nomacs/package.nix | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/pkgs/by-name/no/nomacs/package.nix b/pkgs/by-name/no/nomacs/package.nix index 138e4ead7fcde..a12d5db94b869 100644 --- a/pkgs/by-name/no/nomacs/package.nix +++ b/pkgs/by-name/no/nomacs/package.nix @@ -38,7 +38,10 @@ stdenv.mkDerivation (finalAttrs: { exiv2 libraw libtiff - opencv4 + # Once python stops relying on `propagatedBuildInputs` (https://github.com/NixOS/nixpkgs/issues/272178), deprecate `cxxdev` and switch to `dev`; + # note `dev` is selected by `mkDerivation` automatically, so one should omit `getOutput "dev"`; + # see: https://github.com/NixOS/nixpkgs/pull/314186#issuecomment-2129974277 + (lib.getOutput "cxxdev" opencv4) ] ++ (with libsForQt5; [ qtbase qtimageformats |