Skip to content

Commit

Permalink
cleanup default.nix
Browse files Browse the repository at this point in the history
  • Loading branch information
domenkozar committed Aug 14, 2018
1 parent c3cef8f commit 88fd8be
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 24 deletions.
6 changes: 1 addition & 5 deletions default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ with pkgs.haskell.lib;
overrides = self: super: {
# TODO: separate out output
stack2nix = justStaticExecutables super.stack2nix;

# https://github.com/commercialhaskell/lts-haskell/issues/149
stack = doJailbreak super.stack;

Expand All @@ -14,10 +15,5 @@ with pkgs.haskell.lib;

# https://github.com/NixOS/cabal2nix/issues/146
hinotify = if pkgs.stdenv.isDarwin then self.hfsevents else super.hinotify;
# Darwin fixes upstreamed in nixpkgs commit 71bebd52547f4486816fd320bb3dc6314f139e67
hfsevents = self.callPackage ./hfsevents.nix { inherit (pkgs.darwin.apple_sdk.frameworks) Cocoa CoreServices; };
fsnotify = if pkgs.stdenv.isDarwin
then addBuildDepend (dontCheck super.fsnotify) pkgs.darwin.apple_sdk.frameworks.Cocoa
else dontCheck super.fsnotify;
};
}).stack2nix
19 changes: 0 additions & 19 deletions hfsevents.nix

This file was deleted.

0 comments on commit 88fd8be

Please sign in to comment.