diff options
| author | Orivej Desh <orivej@gmx.fr> | 2017-10-05 07:41:39 +0000 |
|---|---|---|
| committer | Orivej Desh <orivej@gmx.fr> | 2017-10-05 07:41:39 +0000 |
| commit | 66d4941afe2edc8e5287a70089c25464490114f0 (patch) | |
| tree | b1bbd01ad887ae401be7ddc5295431d11d2a95d0 /pkgs/development/interpreters | |
| parent | 514593ea31d7e67e8efa2f2ff26c9569d508a5ef (diff) | |
| parent | b14db2cddfb054c0ff46523fa95ba56153b230e0 (diff) | |
| download | nixlib-66d4941afe2edc8e5287a70089c25464490114f0.tar nixlib-66d4941afe2edc8e5287a70089c25464490114f0.tar.gz nixlib-66d4941afe2edc8e5287a70089c25464490114f0.tar.bz2 nixlib-66d4941afe2edc8e5287a70089c25464490114f0.tar.lz nixlib-66d4941afe2edc8e5287a70089c25464490114f0.tar.xz nixlib-66d4941afe2edc8e5287a70089c25464490114f0.tar.zst nixlib-66d4941afe2edc8e5287a70089c25464490114f0.zip | |
Merge branch 'master' into staging
* master: (48 commits) Mathematica: 11.0.1 -> 11.2.0 kbfs: 20170922.f76290 -> 20171004.40555d packer: 1.0.3 -> 1.1.0 libxdg-basedir: 1.0.2 -> 1.2.0 fscrypt: 0.2.1 -> 0.2.2 devtodo: init at 0.1.20 keybase: 1.0.30 -> 1.0.33 elixir: Fix locale problem on NixOS keybase-gui: 1.0.25 -> 1.0.33 terraform: 0.10.2 -> 0.10.7 (#30055) emby: 3.2.32.0 -> 3.2.33.0 sbcl: 1.3.21 -> 1.4.0 ardour: 5.11 -> 5.12 axoloti: fix evaluation axoloti: init at 1.0.12-1 melpa-packages: Add new lean packages fastlane: init at 2.60.1 nixos/traefik: guard example path go-ethereum: 1.7.0 -> 1.7.1 xzgv: 0.9.1 -> 0.9.2 ...
Diffstat (limited to 'pkgs/development/interpreters')
| -rw-r--r-- | pkgs/development/interpreters/elixir/generic-builder.nix | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/development/interpreters/elixir/generic-builder.nix b/pkgs/development/interpreters/elixir/generic-builder.nix index 8f83a338484c..78598ce3d81e 100644 --- a/pkgs/development/interpreters/elixir/generic-builder.nix +++ b/pkgs/development/interpreters/elixir/generic-builder.nix @@ -22,6 +22,8 @@ in buildInputs = [ erlang rebar makeWrapper ]; + LOCALE_ARCHIVE = stdenv.lib.optionalString stdenv.isLinux + "${pkgs.glibcLocales}/lib/locale/locale-archive"; LANG = "en_US.UTF-8"; LC_TYPE = "en_US.UTF-8"; @@ -30,8 +32,8 @@ in inherit debugInfo; buildFlags = if debugInfo - then "ERL_COMPILER_OPTIONS=debug_info" - else ""; + then "ERL_COMPILER_OPTIONS=debug_info" + else ""; preBuild = '' # The build process uses ./rebar. Link it to the nixpkgs rebar |