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

make glibcLocales linux only

Browse source 
On darwin this isn't needed and is null, causing an evaluation error.
This commit is contained in:
Daiderd Jordan 2018-10-24 08:05:19 +02:00
parent 6a07411c68
commit ca394e80b1
No known key found for this signature in database
GPG key ID: D02435D05B810C96
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";
};
rustEnv = stdenv.mkDerivation rec {
rustEnv = stdenv.mkDerivation (rec {
name = "gh-event-forwarder";
buildInputs = with pkgs; [
bash
@ -55,12 +55,13 @@ let
HISTFILE = "${toString ./.}/.bash_hist";
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_LOG = "ofborg=debug";
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