4 files changed, 26 insertions, 2 deletions
diff --git a/pkgs/development/compilers/cudatoolkit/default.nix b/pkgs/development/compilers/cudatoolkit/default.nix
index f68f918d585..af93cb13d37 100644
--- a/pkgs/development/compilers/cudatoolkit/default.nix
+++ b/pkgs/development/compilers/cudatoolkit/default.nix
@@ -16,6 +16,8 @@ stdenv.mkDerivation rec {
       }
     else throw "cudatoolkit does not support platform ${stdenv.system}";
 
+  outputs = [ "out" "sdk" ];
+
   buildInputs = [ perl ];
 
   runtimeDependencies = [
@@ -30,6 +32,7 @@ stdenv.mkDerivation rec {
     sh $src --keep --noexec
     cd pkg/run_files
     sh cuda-linux64-rel-5.5.22-16488124.run --keep --noexec
+    sh cuda-samples-linux-5.5.22-16488124.run --keep --noexec
     cd pkg
   '';
 
@@ -44,8 +47,9 @@ stdenv.mkDerivation rec {
   '';
 
   installPhase = ''
-    mkdir $out
+    mkdir $out $sdk
     perl ./install-linux.pl --prefix="$out"
+    perl ./install-sdk-linux.pl --prefix="$sdk" --cudaprefix="$out"
   '';
 
   meta = {
diff --git a/pkgs/development/compilers/ghc/7.6.3.nix b/pkgs/development/compilers/ghc/7.6.3.nix
index c0933b2a961..1839c982e99 100644
--- a/pkgs/development/compilers/ghc/7.6.3.nix
+++ b/pkgs/development/compilers/ghc/7.6.3.nix
@@ -21,6 +21,7 @@ stdenv.mkDerivation rec {
   preConfigure = ''
     echo "${buildMK}" > mk/build.mk
     sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
+  '' + stdenv.lib.optionalString (!stdenv.isDarwin) ''
     export NIX_LDFLAGS="$NIX_LDFLAGS -rpath $out/lib/ghc-${version}"
   '';
 
diff --git a/pkgs/development/compilers/llvm/3.4/llvm.nix b/pkgs/development/compilers/llvm/3.4/llvm.nix
index df0bae3218d..1638a132718 100644
--- a/pkgs/development/compilers/llvm/3.4/llvm.nix
+++ b/pkgs/development/compilers/llvm/3.4/llvm.nix
@@ -52,6 +52,6 @@ in stdenv.mkDerivation rec {
     homepage    = http://llvm.org/;
     license     = stdenv.lib.licenses.bsd3;
     maintainers = with stdenv.lib.maintainers; [ shlevy lovek323 raskin viric ];
-    platforms   = stdenv.lib.platforms.all;
+    platforms   = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/compilers/mcpp/default.nix b/pkgs/development/compilers/mcpp/default.nix
new file mode 100644
index 00000000000..34cb63e783e
--- /dev/null
+++ b/pkgs/development/compilers/mcpp/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, fetchurl, mcpp }:
+
+stdenv.mkDerivation rec {
+  name = "mcpp-2.7.2";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/mcpp/${name}.tar.gz";
+    sha256 = "0r48rfghjm90pkdyr4khxg783g9v98rdx2n69xn8f6c5i0hl96rv";
+  };
+
+  configureFlags = [ "--enable-mcpplib" ];
+
+  meta = with stdenv.lib; {
+    homepage = "http://mcpp.sourceforge.net/";
+    description = "A portable c preprocessor";
+    license = licenses.bsd2;
+    platforms = platforms.unix;
+  };
+}