From 786ebf4e12b6638d1bbb48da55a486525a345e88 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 16 Sep 2015 09:11:17 +0200 Subject: [PATCH] haskell-freenect: override is required only for old versions --- pkgs/development/haskell-modules/configuration-common.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 5e596ec931a..1f6ce42bbf7 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -982,11 +982,8 @@ self: super: { ]; }); - # https://github.com/chrisdone/freenect/pull/11 - freenect = overrideCabal super.freenect (drv: { - libraryPkgconfigDepends = [ pkgs.freenect ]; - prePatch = '' echo " Pkgconfig-Depends: libfreenect" >> freenect.cabal ''; - }); + # Old versions don't detect this library reliably. + freenect = appendConfigureFlag super.freenect "--extra-include-dirs=${pkgs.freenect}/include/libfreenect --extra-lib-dirs=${pkgs.freenect}/lib"; # https://github.com/ivanperez-keera/hcwiid/pull/4 hcwiid = overrideCabal super.hcwiid (drv: {