mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-15 10:12:58 +00:00
d69583c6c2
In opencv 2.x, unfree libraries are built by default. The package should therefore have been marked as unfree, but wasn't. I've disabled the non-free libraries by default, and added an option to enable them. There are three programs in Nixpkgs that depend on opencv2: mathematica, pfstools, and p2pvc. pfstools requires the non-free libraries if it's built with opencv support, so I've disabled opencv by default there and added an option to enable it. p2pvc links fine, so presumably doesn't need the non-free libraries. I can't test mathematica, so I'm just going to leave it alone. |
||
---|---|---|
.. | ||
administration | ||
configuration | ||
development | ||
from_md | ||
installation | ||
release-notes | ||
.gitignore | ||
contributing-to-this-manual.chapter.md | ||
default.nix | ||
Makefile | ||
man-configuration.xml | ||
man-nixos-build-vms.xml | ||
man-nixos-enter.xml | ||
man-nixos-generate-config.xml | ||
man-nixos-install.xml | ||
man-nixos-option.xml | ||
man-nixos-rebuild.xml | ||
man-nixos-version.xml | ||
man-pages.xml | ||
manual.xml | ||
md-to-db.sh | ||
preface.xml | ||
README.md | ||
shell.nix |