diff options
| author | Nicolas B. Pierron <nicolas.b.pierron@gmail.com> | 2016-10-31 15:16:29 +0000 |
|---|---|---|
| committer | Nicolas B. Pierron <nicolas.b.pierron@gmail.com> | 2016-10-31 15:16:29 +0000 |
| commit | 59b5bbeae91109007e36a269a94cccc865dc5175 (patch) | |
| tree | 1ee3d18aedace6d66034ea72fea571d20d8d0fee /pkgs/development/libraries/opencv/no-build-info.patch | |
| parent | Do not use old stdenv version in faust wrap functions. (-8 alias, -15 unpatch... (diff) | |
| parent | Merge pull request #19675 from edwtjo/dictd-touchup (diff) | |
| download | nixpkgs-gitlab.intr/security-updates.tar.gz | |
Merge branch master into security-updatesorigin/security-updatesgitlab.intr/security-updates
This merge mostly take the changes made to the master branch.
Some conflict happen in top-level/default.nix due to a reformating of the
code of which is computing the fix-point. This merge fixes these issues by
adding the pkgsIndex argument, needed to re-evaluate the fix-point with
another set of packages, and also re-add the second fix-point made to
support the dependencies.
Diffstat (limited to 'pkgs/development/libraries/opencv/no-build-info.patch')
| -rw-r--r-- | pkgs/development/libraries/opencv/no-build-info.patch | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/pkgs/development/libraries/opencv/no-build-info.patch b/pkgs/development/libraries/opencv/no-build-info.patch new file mode 100644 index 000000000000..4ee9701583a0 --- /dev/null +++ b/pkgs/development/libraries/opencv/no-build-info.patch @@ -0,0 +1,14 @@ +diff -ru -x '*~' opencv-2.4.13-orig/modules/core/src/system.cpp opencv-2.4.13/modules/core/src/system.cpp +--- opencv-2.4.13-orig/modules/core/src/system.cpp 1970-01-01 01:00:01.000000000 +0100 ++++ opencv-2.4.13/modules/core/src/system.cpp 2016-10-02 18:44:53.674181762 +0200 +@@ -442,9 +442,7 @@ + + const std::string& getBuildInformation() + { +- static std::string build_info = +-#include "version_string.inc" +- ; ++ static std::string build_info = "(build info elided)"; + return build_info; + } + |