Build rule updates.

pkgs/default.nix

@@ -103,6 +103,7 @@ let
       rec {
         panpipe        = (pkgs.haskell.lib.doJailbreak super.panpipe);
         spdx           = (pkgs.haskell.lib.doJailbreak super.spdx);
+        monad-mock     = (pkgs.haskell.lib.doJailbreak super.monad-mock);
         generic-pretty = doJailbreak super.generic-pretty;
 
         #minor cabal and version fix

pkgs/qmcpack/default.nix

@@ -11,6 +11,7 @@ stdenv.mkDerivation {
     "-DCMAKE_C_COMPILER=${mpich2}/bin/mpicc"
     "-DCMAKE_CXX_COMPILER=${mpich2}/bin/mpic++"
     "-DQMC_OMP=0"
+    "-DCFLAGS=-O2"
   ] ++ optionals nrmSupport [
     "-DQMC_INCLUDE=${libnrm}/include/"
     "-DQMC_EXTRA_LIBS=${libnrm}/lib/libnrm.so"

pkgs/stream/default.nix

@@ -13,7 +13,7 @@ stdenv.mkDerivation {
   buildInputs = optional nrmSupport libnrm;
 
   preBuild =
-    "substituteInPlace Makefile --replace 'CFLAGS =' 'CFLAGS = -DSTREAM_ARRAY_SIZE=${problemSize} -DNTIMES=${iterationCount}'";
+    "substituteInPlace Makefile --replace 'CFLAGS =' 'CFLAGS = -O2 -march=native -DSTREAM_ARRAY_SIZE=${problemSize} -DNTIMES=${iterationCount}'";
 
   buildFlags = "CC=gcc FC=gfortran";