Skip to content

Commit cfe36cb

Browse files
committed
Use pkgsBuildBuild instead of buildPackages in Cabal2Nix
1 parent 7bcd019 commit cfe36cb

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

nix-tools/nix-tools/lib/Cabal2Nix.hs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -403,12 +403,12 @@ instance ToNixExpr SetupDependency where
403403
toNix (SetupDependency pkgName' LMainLibName) =
404404
-- TODO once https://github.com/haskell-nix/hnix/issues/52
405405
-- is reolved use something like:
406-
-- [nix| hsPkgs.buildPackages.$((pkgName)) or pkgs.buildPackages.$((pkgName)) ]
406+
-- [nix| hsPkgs.pkgsBuildBuild.$((pkgName)) or pkgs.pkgsBuildBuild.$((pkgName)) ]
407407
selectOr (mkSym hsPkgs) buildPackagesDotName
408408
(selectOr (mkSym pkgs) buildPackagesDotName (mkSym errorHandler @. setupDepError @@ mkStr pkg))
409409
where
410410
pkg = fromString . show . pretty $ pkgName'
411-
buildPackagesDotName = mkSelector "buildPackages" <> mkSelector pkg
411+
buildPackagesDotName = mkSelector "pkgsBuildBuild" <> mkSelector pkg
412412
toNix (SetupDependency pkgName' (LSubLibName l)) = selectOr (mkSym hsPkgs) (
413413
mkSelector "buildPackages"
414414
<> mkSelector (quoted pkg)
@@ -423,7 +423,7 @@ instance ToNixExpr SetupDependency where
423423
instance ToNixExpr BuildToolDependency where
424424
toNix (BuildToolDependency pkgName' componentName') =
425425
selectOr (mkSym hsPkgs) (
426-
mkSelector "buildPackages"
426+
mkSelector "pkgsBuildBuild"
427427
<> mkSelector pkg
428428
<> mkSelector "components"
429429
<> mkSelector "exes"

0 commit comments

Comments
 (0)