dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

opencv4: propagate real outputs in cxxdev even without cuda

Browse Source 
Hotfix https://github.com/NixOS/nixpkgs/issues/276691
This commit is contained in:
Someone Serge 2023-12-25 11:56:06 +00:00
parent 56066347c4
commit 7954fc68cb
No known key found for this signature in database
GPG Key ID: 7B0E3B1390D61DA4
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/development/libraries/opencv/4.x.nix
View File

@ -472,7 +472,12 @@ effectiveStdenv.mkDerivation {
postInstall = '' postInstall = ''
sed -i "s|{exec_prefix}/$out|{exec_prefix}|;s|{prefix}/$out|{prefix}|" \ sed -i "s|{exec_prefix}/$out|{exec_prefix}|;s|{prefix}/$out|{prefix}|" \
"$out/lib/pkgconfig/opencv4.pc" "$out/lib/pkgconfig/opencv4.pc"
mkdir $cxxdev mkdir "$cxxdev"
''
# Temporary fix for https://github.com/NixOS/nixpkgs/issues/276691
+ lib.optionalString (!enableCuda) ''
mkdir -p "$cxxdev/nix-support"
echo "''${!outputDev}" >> "$cxxdev/nix-support/propagated-build-inputs"
'' ''
# install python distribution information, so other packages can `import opencv` # install python distribution information, so other packages can `import opencv`
+ lib.optionalString enablePython '' + lib.optionalString enablePython ''