diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-08-30 12:43:37 +0300 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-08-30 12:43:37 +0300 |
| commit | d3dc3d4130a9b4b9ca80b6fd5e0c3f5d01cddf41 (patch) | |
| tree | 3fd2e86b20f4251fa91ace5efb393ee66700fbb8 /pkgs/development/haskell-modules/configuration-common.nix | |
| parent | e6f1028340d7ab1c485efccbbbbaec4b9cb5712a (diff) | |
| parent | 03fb2c1f32825dd7d43a456667db5848b47f4ea3 (diff) | |
| download | nixlib-d3dc3d4130a9b4b9ca80b6fd5e0c3f5d01cddf41.tar nixlib-d3dc3d4130a9b4b9ca80b6fd5e0c3f5d01cddf41.tar.gz nixlib-d3dc3d4130a9b4b9ca80b6fd5e0c3f5d01cddf41.tar.bz2 nixlib-d3dc3d4130a9b4b9ca80b6fd5e0c3f5d01cddf41.tar.lz nixlib-d3dc3d4130a9b4b9ca80b6fd5e0c3f5d01cddf41.tar.xz nixlib-d3dc3d4130a9b4b9ca80b6fd5e0c3f5d01cddf41.tar.zst nixlib-d3dc3d4130a9b4b9ca80b6fd5e0c3f5d01cddf41.zip | |
Merge remote-tracking branch 'dezgeg/shuffle-outputs' into staging
https://github.com/NixOS/nixpkgs/pull/14766
Diffstat (limited to 'pkgs/development/haskell-modules/configuration-common.nix')
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-common.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 9fa66338d8ca..7e1023134d54 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -824,10 +824,10 @@ self: super: { # https://github.com/ivanperez-keera/hcwiid/pull/4 hcwiid = overrideCabal super.hcwiid (drv: { configureFlags = (drv.configureFlags or []) ++ [ - "--extra-lib-dirs=${pkgs.bluez}/lib" + "--extra-lib-dirs=${pkgs.bluez.out}/lib" "--extra-lib-dirs=${pkgs.cwiid}/lib" "--extra-include-dirs=${pkgs.cwiid}/include" - "--extra-include-dirs=${pkgs.bluez}/include" + "--extra-include-dirs=${pkgs.bluez.dev}/include" ]; prePatch = '' sed -i -e "/Extra-Lib-Dirs/d" -e "/Include-Dirs/d" "hcwiid.cabal" ''; }); |