make llvm-3.5 the default and remove references to gccApple

make perl be less dumb revert change to release.nix
2015-02-03 14:31:04 -08:00
parent ebb8d03f96
commit dbf3d31727
4 changed files with 69 additions and 109 deletions
@@ -1,9 +1,11 @@
 { stdenv, fetchurl, fetchpatch, replace, curl, expat, zlib, bzip2, libarchive
-, useNcurses ? false, ncurses, useQt4 ? false, qt4
+, useNcurses ? false, ncurses, useQt4 ? false, qt4, wantPS ? false, ps ? null
 }:

 with stdenv.lib;

+assert wantPS -> (ps != null);
+
 let
  os = stdenv.lib.optionalString;
  majorVersion = "2.8";
@@ -43,6 +45,8 @@ stdenv.mkDerivation rec {
    ++ optional useNcurses ncurses
    ++ optional useQt4 qt4;

+  propagatedBuildInputs = optional wantPS ps;
+
  CMAKE_PREFIX_PATH = stdenv.lib.concatStringsSep ":" buildInputs;
  
  configureFlags =