diff options
author | Dominic Steinitz <dominic@steinitz.org> | 2018-03-01 09:14:18 +0000 |
---|---|---|
committer | Dominic Steinitz <dominic@steinitz.org> | 2018-03-01 09:14:18 +0000 |
commit | d1ac8d1e1ae4f50bf41cffb6754f422a859f4e83 (patch) | |
tree | 5b13977f8c8ab3cc16052073a7c1c8a873156561 /pkgs/development/haskell-modules/configuration-nix.nix | |
parent | 183c3603fa7531afac66a0e22a9162c56c813623 (diff) | |
parent | 1cb726b937463900a6aafa46c46ee7f3aaf8fb6e (diff) | |
download | nixlib-d1ac8d1e1ae4f50bf41cffb6754f422a859f4e83.tar nixlib-d1ac8d1e1ae4f50bf41cffb6754f422a859f4e83.tar.gz nixlib-d1ac8d1e1ae4f50bf41cffb6754f422a859f4e83.tar.bz2 nixlib-d1ac8d1e1ae4f50bf41cffb6754f422a859f4e83.tar.lz nixlib-d1ac8d1e1ae4f50bf41cffb6754f422a859f4e83.tar.xz nixlib-d1ac8d1e1ae4f50bf41cffb6754f422a859f4e83.tar.zst nixlib-d1ac8d1e1ae4f50bf41cffb6754f422a859f4e83.zip |
Merge branch 'master' of https://github.com/NixOS/nixpkgs
Diffstat (limited to 'pkgs/development/haskell-modules/configuration-nix.nix')
-rw-r--r-- | pkgs/development/haskell-modules/configuration-nix.nix | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index e367b5283554..55f463885bdb 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -488,11 +488,8 @@ self: super: builtins.intersectAttrs super { liquid-fixpoint = disableSharedExecutables super.liquid-fixpoint; liquidhaskell = dontCheck (disableSharedExecutables super.liquidhaskell); - # Haskell OpenCV bindings need contrib code enabled in the C++ library. - opencv = super.opencv.override { opencv3 = pkgs.opencv3.override { enableContrib = true; }; }; - # Without this override, the builds lacks pkg-config. - opencv-extra = addPkgconfigDepend super.opencv-extra (pkgs.opencv3.override { enableContrib = true; }); + opencv-extra = addPkgconfigDepend super.opencv-extra pkgs.opencv3; # Break cyclic reference that results in an infinite recursion. partial-semigroup = dontCheck super.partial-semigroup; |