public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

buildLocalCabal: do not set LANG/LOCALE_ARCHIVE on non-linux machines

Browse Source
This commit is contained in:
Vladimir Kirillov 2014-03-30 14:46:28 +08:00
parent 9186f0b5dd
commit bad9de86b6
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/top-level/haskell-packages.nix
View File

@ -2903,13 +2903,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
# Build a cabal package given a local .cabal file # Build a cabal package given a local .cabal file
buildLocalCabal = src: name: let buildLocalCabal = src: name: let
cabalExpr = pkgs.stdenv.mkDerivation { cabalExpr = pkgs.stdenv.mkDerivation ({
name = "${name}.nix"; name = "${name}.nix";
LANG = "en_US.UTF-8";
LOCALE_ARCHIVE = "${pkgs.glibcLocales}/lib/locale/locale-archive";
buildCommand = '' buildCommand = ''
${self.cabal2nix}/bin/cabal2nix ${src + "/${name}.cabal"} --sha256=FILTERME \ ${self.cabal2nix}/bin/cabal2nix ${src + "/${name}.cabal"} --sha256=FILTERME \
| grep -v FILTERME | sed \ | grep -v FILTERME | sed \
@ -2917,7 +2913,11 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
-e 's/{ cabal/{ cabal, src/' \ -e 's/{ cabal/{ cabal, src/' \
-e 's/pname = \([^\n]*\)/pname = \1\n inherit src;\n jailbreak = true;/' > $out -e 's/pname = \([^\n]*\)/pname = \1\n inherit src;\n jailbreak = true;/' > $out
''; '';
};
} // pkgs.lib.optionalAttrs pkgs.stdenv.isLinux {
LANG = "en_US.UTF-8";
LOCALE_ARCHIVE = "${pkgs.glibcLocales}/lib/locale/locale-archive";
});
in callPackage cabalExpr { inherit src; }; in callPackage cabalExpr { inherit src; };
cabalDev = callPackage ../development/tools/haskell/cabal-dev {}; cabalDev = callPackage ../development/tools/haskell/cabal-dev {};