Merge branch 'master' into staging

Hydra nixpkgs: ?compare=1282763
2016-07-12 22:00:10 +02:00
parent ba2eec97b5 9aa3e78ab2
commit 40785f0dac
131 changed files with 2024 additions and 918 deletions
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, gcc5 }:
+{ stdenv, fetchFromGitHub, gcc }:

 stdenv.mkDerivation rec {
  name = "icmake-${version}";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {

  sourceRoot = "icmake-${version}-src/icmake";

-  buildInputs = [ gcc5 ];
+  buildInputs = [ gcc ];

  preConfigure = ''
    patchShebangs ./