From fc7c75151538491b1d4ee97e589e1e7123237d8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Fri, 27 May 2016 15:49:17 +0200
Subject: [PATCH] Fix nixpkgs eval (caused by 'emscripten' expression)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes this:

 $ nix-env -f . -qa '*' --meta --xml --drv-path --show-trace
 error: while evaluating ‘callPackageWith’ at .../lib/customisation.nix:93:35, called from .../pkgs/top-level/all-packages.nix:1411:24:
 while evaluating ‘makeOverridable’ at .../lib/customisation.nix:54:24, called from .../lib/customisation.nix:97:8:
 undefined variable ‘srcFC’ at .../pkgs/development/compilers/emscripten-fastcomp/default.nix:26:14

Also, "matthewbauer" is not defined in ./lib/maintainers.nix, comment
out.

Caused by f646b9295ea7a2332667f5ffeb5bd871e76982e9 and
d078fe1e9c826a63ad078ca4d5364c967984f393.
---
 pkgs/development/compilers/emscripten-fastcomp/default.nix | 4 ++--
 pkgs/development/compilers/emscripten/default.nix          | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/emscripten-fastcomp/default.nix b/pkgs/development/compilers/emscripten-fastcomp/default.nix
index 6256438ce5f..2de1f4dd9bd 100644
--- a/pkgs/development/compilers/emscripten-fastcomp/default.nix
+++ b/pkgs/development/compilers/emscripten-fastcomp/default.nix
@@ -4,7 +4,7 @@ let
   rev = "1.36.4";
 in
 
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "emscripten-fastcomp-${rev}";
 
   srcFC = fetchFromGitHub {
@@ -40,7 +40,7 @@ stdenv.mkDerivation {
     homepage = https://github.com/kripken/emscripten-fastcomp;
     description = "emscripten llvm";
     platforms = platforms.all;
-    maintainers = with maintainers; [ qknight matthewbauer ];
+    maintainers = with maintainers; [ qknight /*matthewbauer (undefined) */ ];
     license = stdenv.lib.licenses.ncsa;
   };
 }
diff --git a/pkgs/development/compilers/emscripten/default.nix b/pkgs/development/compilers/emscripten/default.nix
index c78808b81bc..51165ae3b6f 100644
--- a/pkgs/development/compilers/emscripten/default.nix
+++ b/pkgs/development/compilers/emscripten/default.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation {
     homepage = https://github.com/kripken/emscripten;
     description = "An LLVM-to-JavaScript Compiler";
     platforms = platforms.all;
-    maintainers = with maintainers; [ qknight matthewbauer ];
+    maintainers = with maintainers; [ qknight /*matthewbauer (undefined) */ ];
     license = licenses.ncsa;
   };
 }