From be90e9aa311027be249a4faade59eda265b2043d Mon Sep 17 00:00:00 2001 From: Nicholas Clarke Date: Mon, 21 Aug 2017 16:50:02 +0100 Subject: [PATCH] Fix broken rebase. --- pkgs/development/haskell-modules/generic-builder.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index d56a713318b..d49f3112923 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -432,7 +432,7 @@ stdenv.mkDerivation ({ # the directory containing the haddock documentation. # `null' if no haddock documentation was built. # TODO: fetch the self from the fixpoint instead - haddockDir = self: if doHaddock then "${docdir self.doc}/html" else null; + haddockDir = self: if doHaddock then "${docDir}/html" else null; env = stdenv.mkDerivation { name = "interactive-${pname}-${version}-environment";