colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #293081 from b-rodrigues/fix_opencv

Browse Source 
rPackages.opencv: fixed build
This commit is contained in:
Weijia Wang 2024-03-17 23:10:01 +01:00 committed by GitHub
commit c4fc639fd3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/r-modules/default.nix
View File

@ -382,6 +382,7 @@ let
nloptr = with pkgs; [ nlopt pkg-config ];
n1qn1 = [ pkgs.gfortran ];
odbc = [ pkgs.unixODBC ];
opencv = [ pkgs.pkg-config ];
pak = [ pkgs.curl.dev ];
pander = with pkgs; [ pandoc which ];
pbdMPI = [ pkgs.mpi ];
@ -1414,6 +1415,13 @@ let
RGL_USE_NULL = "true";
});
opencv = let
opencvGtk = pkgs.opencv.override (old : { enableGtk2 = true; });
in old.opencv.overrideAttrs (attrs: {
buildInputs = attrs.buildInputs ++ [ opencvGtk ];
});
Rhdf5lib = let
hdf5 = pkgs.hdf5_1_10.overrideAttrs (attrs: {configureFlags = attrs.configureFlags ++ ["--enable-cxx"];});
in old.Rhdf5lib.overrideAttrs (attrs: {