Fix separate output attr

typeable · Aug 21, 2017 · c67c0d8 · c67c0d8
1 parent b5c8918
commit c67c0d8
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/src/Distribution/Nixpkgs/Haskell/FromStack.hs b/src/Distribution/Nixpkgs/Haskell/FromStack.hs
@@ -89,3 +89,5 @@ fromPackage conf pconf plan pkg =
       & doCheck .~ testsEnabled
       & runHaddock .~ haddocksEnabled
       & metaSection . Nix.broken .~ brokenEnabled
+      -- TODO: remove after Nixos/Nixpkgs #27196 released
+      & enableSeparateDataOutput .~ False
diff --git a/src/Distribution/Nixpkgs/Haskell/Stack.hs b/src/Distribution/Nixpkgs/Haskell/Stack.hs
@@ -74,7 +74,11 @@ packageDerivation
   -> IO Derivation
 packageDerivation conf optHackageDb stackPackage = do
   pkg <- getStackPackageFromDb optHackageDb stackPackage
-  let drv = genericPackageDerivation conf pkg & src .~ pkgSource pkg
+  let
+    drv = genericPackageDerivation conf pkg
+      & src .~ pkgSource pkg
+      -- TODO: remove after Nixos/Nixpkgs #27196 released
+      & enableSeparateDataOutput .~ False
   return $ if stackPackage ^. spExtraDep
     then drv
       & doCheck &&~ conf ^. spcDoCheckStackage