diff options
| author | Someone Serge <sergei.kozlukov@aalto.fi> | 2023-12-25 11:56:06 +0000 |
|---|---|---|
| committer | Someone Serge <sergei.kozlukov@aalto.fi> | 2023-12-25 11:56:37 +0000 |
| commit | 7954fc68cbc1710c62be71007483fdbbdfad1dac (patch) | |
| tree | 1ea36862a49e166370293170c6464f6481e6f70b /pkgs/development/libraries | |
| parent | 56066347c4561a3b261a59658f3b25daab68a063 (diff) | |
| download | nixlib-7954fc68cbc1710c62be71007483fdbbdfad1dac.tar nixlib-7954fc68cbc1710c62be71007483fdbbdfad1dac.tar.gz nixlib-7954fc68cbc1710c62be71007483fdbbdfad1dac.tar.bz2 nixlib-7954fc68cbc1710c62be71007483fdbbdfad1dac.tar.lz nixlib-7954fc68cbc1710c62be71007483fdbbdfad1dac.tar.xz nixlib-7954fc68cbc1710c62be71007483fdbbdfad1dac.tar.zst nixlib-7954fc68cbc1710c62be71007483fdbbdfad1dac.zip | |
opencv4: propagate real outputs in cxxdev even without cuda
Hotfix https://github.com/NixOS/nixpkgs/issues/276691
Diffstat (limited to 'pkgs/development/libraries')
| -rw-r--r-- | pkgs/development/libraries/opencv/4.x.nix | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix index 023e56940b75..7adea04a6a84 100644 --- a/pkgs/development/libraries/opencv/4.x.nix +++ b/pkgs/development/libraries/opencv/4.x.nix @@ -472,7 +472,12 @@ effectiveStdenv.mkDerivation { postInstall = '' sed -i "s|{exec_prefix}/$out|{exec_prefix}|;s|{prefix}/$out|{prefix}|" \ "$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` + lib.optionalString enablePython '' |