danderson/ofborg
0
0
Fork 0
forked from the-distro/ofborg
Code Pull requests Activity

Merge pull request #259 from LnL7/darwin-locale

Browse source 
make glibcLocales linux only
This commit is contained in:
Graham Christensen 2018-10-31 11:54:12 +01:00 committed by GitHub
parent 319fff49d0 ca394e80b1
commit 181d67c86c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
shell.nix
View file

@ -31,7 +31,7 @@ let
# HISTFILE = "${src}/.bash_hist"; # HISTFILE = "${src}/.bash_hist";
}; };
rustEnv = stdenv.mkDerivation rec { rustEnv = stdenv.mkDerivation (rec {
name = "gh-event-forwarder"; name = "gh-event-forwarder";
buildInputs = with pkgs; [ buildInputs = with pkgs; [
bash bash
@ -55,12 +55,13 @@ let
HISTFILE = "${toString ./.}/.bash_hist"; HISTFILE = "${toString ./.}/.bash_hist";
RUSTFLAGS = "-D warnings"; RUSTFLAGS = "-D warnings";
LOCALE_ARCHIVE_2_21 = "${oldpkgs.glibcLocales}/lib/locale/locale-archive";
LOCALE_ARCHIVE_2_27 = "${pkgs.glibcLocales}/lib/locale/locale-archive";
RUST_BACKTRACE = "1"; RUST_BACKTRACE = "1";
RUST_LOG = "ofborg=debug"; RUST_LOG = "ofborg=debug";
passthru.phpEnv = phpEnv; passthru.phpEnv = phpEnv;
}; }
// stdenv.lib.optionalAttrs stdenv.isLinux {
LOCALE_ARCHIVE_2_21 = "${oldpkgs.glibcLocales}/lib/locale/locale-archive";
LOCALE_ARCHIVE_2_27 = "${pkgs.glibcLocales}/lib/locale/locale-archive";
});
in rustEnv in rustEnv