From 8db23bc08f7da2d3a21367d2303c248912dd9f43 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 6 Aug 2015 14:02:12 +0200 Subject: [PATCH] haskell-ghc-paths: register Nixpkgs-specific patch This used to be added by cabal2nix, but now the tool no longer does because there's no reliable way to refer to the patch file in the generated build expression. --- pkgs/development/haskell-modules/configuration-common.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 20dbe979f78..65298b9dd02 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -14,6 +14,9 @@ self: super: { # Link statically to avoid runtime dependency on GHC. jailbreak-cabal = disableSharedExecutables super.jailbreak-cabal; + # Apply NixOS-specific patches. + ghc-paths = appendPatch super.ghc-paths ./patches/ghc-paths-nix.patch; + # Break infinite recursions. Dust-crypto = dontCheck super.Dust-crypto; hasql-postgres = dontCheck super.hasql-postgres;