diff options
| author | Daiderd Jordan <daiderd@gmail.com> | 2016-08-06 17:56:18 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-06 17:56:18 +0200 |
| commit | d764e55a1cabb56a5b79388a5f577a7c6051812e (patch) | |
| tree | 7e04c9380c9a5caf86bf60a95410087a5530ecab /pkgs | |
| parent | 89c867196cd0db983eaef80e6ad497edaea362e0 (diff) | |
| parent | 7aaf75608fc75e0213f630c860c962bf179686e0 (diff) | |
| download | nixlib-d764e55a1cabb56a5b79388a5f577a7c6051812e.tar nixlib-d764e55a1cabb56a5b79388a5f577a7c6051812e.tar.gz nixlib-d764e55a1cabb56a5b79388a5f577a7c6051812e.tar.bz2 nixlib-d764e55a1cabb56a5b79388a5f577a7c6051812e.tar.lz nixlib-d764e55a1cabb56a5b79388a5f577a7c6051812e.tar.xz nixlib-d764e55a1cabb56a5b79388a5f577a7c6051812e.tar.zst nixlib-d764e55a1cabb56a5b79388a5f577a7c6051812e.zip | |
Merge pull request #17564 from LnL7/darwin-haskell-fsnotify
haskellPackages.fsnotify: add darwin build dependency
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-common.nix | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 4499f260d60d..690153a27792 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -160,7 +160,9 @@ self: super: { # FSEvents API is very buggy and tests are unreliable. See # http://openradar.appspot.com/10207999 and similar issues. # https://github.com/haskell-fswatch/hfsnotify/issues/62 - fsnotify = dontCheck super.fsnotify; # if pkgs.stdenv.isDarwin then dontCheck super.fsnotify else super.fsnotify; + fsnotify = if pkgs.stdenv.isDarwin + then addBuildDepend (dontCheck super.fsnotify) pkgs.darwin.apple_sdk.frameworks.Cocoa + else dontCheck super.fsnotify; # the system-fileio tests use canonicalizePath, which fails in the sandbox system-fileio = if pkgs.stdenv.isDarwin then dontCheck super.system-fileio else super.system-fileio; |