From 9f2bbf65af24e11451f40ac91e87accd3d16411e Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Mon, 1 May 2017 18:21:42 -0400 Subject: [PATCH] haskellSrc2nix: preferLocalBuild and use unwrapped cabal2nix. No need to download bazaar etc... --- pkgs/development/haskell-modules/make-package-set.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix index 6a17762a1fe..5192e09e2de 100644 --- a/pkgs/development/haskell-modules/make-package-set.nix +++ b/pkgs/development/haskell-modules/make-package-set.nix @@ -89,7 +89,8 @@ self: let sha256Arg = if isNull sha256 then "--sha256=" else ''--sha256="${sha256}"''; in pkgs.stdenv.mkDerivation { name = "cabal2nix-${name}"; - buildInputs = [ pkgs.cabal2nix ]; + buildInputs = [ pkgs.haskellPackages.cabal2nix ]; + preferLocalBuild = true; phases = ["installPhase"]; LANG = "en_US.UTF-8"; LOCALE_ARCHIVE = pkgs.lib.optionalString pkgs.stdenv.isLinux "${pkgs.glibcLocales}/lib/locale/locale-archive";