From 059b3f06690642852c7deaef2cc5740c5ed18ee7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 4 Sep 2006 10:10:21 +0000
Subject: * Grmbl grmbl.

svn path=/nixpkgs/trunk/; revision=6451
---
 pkgs/misc/ghostscript/default.nix          |  6 +++---
 pkgs/misc/ghostscript/ghostscript-8.54.nix | 30 ------------------------------
 2 files changed, 3 insertions(+), 33 deletions(-)
 delete mode 100644 pkgs/misc/ghostscript/ghostscript-8.54.nix

(limited to 'pkgs/misc/ghostscript')

diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix
index 74b10471c787..9d02a2a01e83 100644
--- a/pkgs/misc/ghostscript/default.nix
+++ b/pkgs/misc/ghostscript/default.nix
@@ -5,12 +5,12 @@
 assert x11Support -> x11 != null;
 
 stdenv.mkDerivation {
-  name = "ghostscript-8.15";
+  name = "ghostscript-8.54";
   builder = ./builder.sh;
   
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/ghostscript-8.15.tar.bz2;
-    md5 = "ab8502f30629b730e0c9ca56b88a6b9d";
+    url = http://surfnet.dl.sourceforge.net/sourceforge/ghostscript/ghostscript-8.54-gpl.tar.bz2;
+    md5 = "5d0ad0da8297fe459a788200f0eaeeba";
   };
 
   fonts = [
diff --git a/pkgs/misc/ghostscript/ghostscript-8.54.nix b/pkgs/misc/ghostscript/ghostscript-8.54.nix
deleted file mode 100644
index 9d02a2a01e83..000000000000
--- a/pkgs/misc/ghostscript/ghostscript-8.54.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ stdenv, fetchurl, libjpeg, libpng, zlib
-, x11Support, x11 ? null
-}:
-
-assert x11Support -> x11 != null;
-
-stdenv.mkDerivation {
-  name = "ghostscript-8.54";
-  builder = ./builder.sh;
-  
-  src = fetchurl {
-    url = http://surfnet.dl.sourceforge.net/sourceforge/ghostscript/ghostscript-8.54-gpl.tar.bz2;
-    md5 = "5d0ad0da8297fe459a788200f0eaeeba";
-  };
-
-  fonts = [
-    (fetchurl {
-      url = http://nix.cs.uu.nl/dist/tarballs/ghostscript-fonts-std-8.11.tar.gz;
-      md5 = "6865682b095f8c4500c54b285ff05ef6";
-    })
-    # ... add other fonts here
-  ];
-
-  buildInputs = [
-    libjpeg libpng zlib
-    (if x11Support then x11 else null)
-  ];
-
-  configureFlags = if x11Support then "--with-x" else "--without-x";
-}
-- 
cgit 1.4.1