Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
base: b0ec4b8cc7dc
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: fda2318eabae
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on May 15, 2017

  1. opencv: Fix OpenCV build on non NixOS platform 

    OpenCV's CMakeFile will use libraries in /lib and /lib64 if it can
find libraries from those paths. However, it causes
build failure because nix detects impure paths being used.
    @sifmelcara
    sifmelcara committed May 15, 2017
    Configuration menu
    Copy the full SHA
    b496ffb View commit details
    Browse the repository at this point in the history

Commits on May 16, 2017

  1. Merge pull request #25814 from sifmelcara/fix/opencvCMakeLibraryPath 

    opencv: Fix OpenCV build on non NixOS platform
    @FRidh
    FRidh committed May 16, 2017
    Configuration menu
    Copy the full SHA
    fda2318 View commit details
    Browse the repository at this point in the history