Merge branch 'released' into patch-1

NixOS · Oct 31, 2018 · 74bd9f7 · 74bd9f7
2 parents 346649f + b5f95f4
commit 74bd9f7
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/config.extra-known-users.json b/config.extra-known-users.json
@@ -1,11 +1,14 @@
 [
+    "aanderse",
     "akru",
     "alyssais",
     "arianvp",
+    "bbarker",
     "bhipple",
     "bignaux",
     "brainrape",
     "costrouc",
+    "danieldk",
     "dywedir",
     "edef1c",
     "Ekleog",
@@ -16,6 +19,7 @@
     "eqyiel",
     "fgaz",
     "florianjacob",
+    "geistesk",
     "grwlf",
     "imalsogreg",
     "jlesquembre",
@@ -42,5 +46,6 @@
     "woffs",
     "worldofpeace",
     "xeji",
+    "yesbox",
     "yurrriq"
 ]
diff --git a/shell.nix b/shell.nix
@@ -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