diff options
| author | Peter Simons <simons@cryp.to> | 2015-09-16 09:11:17 +0200 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2015-09-19 08:20:50 +0200 |
| commit | 786ebf4e12b6638d1bbb48da55a486525a345e88 (patch) | |
| tree | fad101bfe9c0a7253bbaf6d97ed2a87c44227611 /pkgs/development/haskell-modules/configuration-common.nix | |
| parent | 2aaa587b71e19ff105fc482414f9dbc3060d57b6 (diff) | |
| download | nixpkgs-786ebf4e12b6638d1bbb48da55a486525a345e88.tar nixpkgs-786ebf4e12b6638d1bbb48da55a486525a345e88.tar.gz nixpkgs-786ebf4e12b6638d1bbb48da55a486525a345e88.tar.bz2 nixpkgs-786ebf4e12b6638d1bbb48da55a486525a345e88.tar.lz nixpkgs-786ebf4e12b6638d1bbb48da55a486525a345e88.tar.xz nixpkgs-786ebf4e12b6638d1bbb48da55a486525a345e88.tar.zst nixpkgs-786ebf4e12b6638d1bbb48da55a486525a345e88.zip | |
haskell-freenect: override is required only for old versions
Diffstat (limited to 'pkgs/development/haskell-modules/configuration-common.nix')
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-common.nix | 7 |
1 files 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: { |