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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 1f18973d53d6
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 4b033e3e492c
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Dec 24, 2018

  1. opencv4: opencv_contrib: 4.0.0 -> 4.0.1

    @basvandijk
    basvandijk committed Dec 24, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    Ekleog Léo Gaspard
    GPG key ID: 8A55848B6090F9CF
    Verified
    Learn about vigilant mode
    Copy the full SHA
    e36ab21 View commit details

  2. Merge pull request #52794 from LumiGuide/opencv_contrib-4.0.1 

    opencv4: opencv_contrib: 4.0.0 -> 4.0.1
    @basvandijk
    basvandijk authored Dec 24, 2018
    Copy the full SHA
    4b033e3 View commit details
Showing with 3 additions and 15 deletions.
  1. +3 −15 pkgs/development/libraries/opencv/4.x.nix
18 changes: 3 additions & 15 deletions pkgs/development/libraries/opencv/4.x.nix
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{ lib, stdenv
, fetchurl, fetchFromGitHub, fetchpatch
, fetchurl, fetchFromGitHub
, cmake, pkgconfig, unzip, zlib, pcre, hdf5
, glog, boost, google-gflags, protobuf
, config
@@ -47,10 +47,8 @@ let
contribSrc = fetchFromGitHub {
owner = "opencv";
repo = "opencv_contrib";
# TODO: set to `version` when opencv_contrib-4.0.1 is released;
# See: http://answers.opencv.org/question/205793/will-there-be-a-opencv_contrib-401-release-now-that-opencv-401-is-out/
rev = "4.0.0";
sha256 = "1g4pzw7hv1v9jp1nrqjxqwpi1byl3mxkj6w6ibq6ydsn0138p66z";
rev = version;
sha256 = "0svw8f6nvnzmrc0baj6priq4hbijla4kl6gzy8yif1jfvcwb1syy";
};

# Contrib must be built in order to enable Tesseract support:
@@ -162,16 +160,6 @@ stdenv.mkDerivation rec {
cp --no-preserve=mode -r "${contribSrc}/modules" "$NIX_BUILD_TOP/source/opencv_contrib"
'';

patches =
# Fixes issue: https://github.com/opencv/opencv_contrib/issues/1923
# PR: https://github.com/opencv/opencv_contrib/pull/1913
lib.optional buildContrib (fetchpatch {
url = https://github.com/opencv/opencv_contrib/commit/e068b62a1432d4d5688693a9e20bf175dfaa9a3e.patch;
sha256 = "102mq1qgmla40hhj8mda70inhakdazm9agyah98kq9931scvf0c9";
stripLen = 2;
extraPrefix = "opencv_contrib/";
});

# This prevents cmake from using libraries in impure paths (which
# causes build failure on non NixOS)
# Also, work around https://github.com/NixOS/nixpkgs/issues/26304 with