Merge branch 'master' into staging

Conflicts (relatively simple): pkgs/applications/audio/spotify/default.nix pkgs/build-support/cc-wrapper/default.nix pkgs/development/compilers/cryptol/1.8.x.nix
2015-01-31 19:34:57 +01:00
parent 5dab625862 b50cabf2d4
commit dbae4f109f
564 changed files with 41839 additions and 27779 deletions
@@ -9,6 +9,8 @@ stdenv.mkDerivation rec {
    sha256 = "1fn6kh8mdy65rrgjif7j9wn3mxg1mrrcnhzpi86hfy24ic6bahk8";
  };

+  patches = [ ./0001-Fix-for-openssl-1.0.1i.patch ];
+
  configurePhase = ''
    export PATH=$PATH:${which}/bin
    export QTDIR=${qt4}