Merge branch 'master.upstream' into staging.upstream

2015-08-03 14:27:14 -07:00
parent 32caa604e3 f2d3b5ead9
commit a2da9cfcaf
56 changed files with 5999 additions and 253 deletions
--- a/pkgs/misc/ghostscript/default.nix
+++ b/pkgs/misc/ghostscript/default.nix
@@ -57,6 +57,12 @@ stdenv.mkDerivation rec {
    # [] # maybe sometimes jpeg2000 support
    ;

+  patches = [
+    ./urw-font-files.patch
+    # fetched from debian's ghostscript 9.15_dfsg-1 (called 020150707~0c0b085.patch there)
+    ./CVE-2015-3228.patch
+  ];
+
  makeFlags = [ "cups_serverroot=$(out)" "cups_serverbin=$(out)/lib/cups" ];

  preConfigure = ''