From 271b7ad0064b40a6ab970c5b46de9b89ccd6dabe Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Thu, 3 Sep 2015 11:52:26 +0200
Subject: [PATCH] Revert "zbar: ghostscript was missing for zbar"

This reverts commit a906355b8ab404baa20dc167225d57e3120f067d.

Fixed imagemagick -lgs reference in .la file.

cc @garbas
---
 pkgs/tools/graphics/zbar/default.nix | 2 +-
 pkgs/top-level/all-packages.nix      | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/tools/graphics/zbar/default.nix b/pkgs/tools/graphics/zbar/default.nix
index af98e3c014c..51dcc2a9c80 100644
--- a/pkgs/tools/graphics/zbar/default.nix
+++ b/pkgs/tools/graphics/zbar/default.nix
@@ -1,6 +1,6 @@
 x@{builderDefsPackage
   , imagemagickBig, pkgconfig, python, pygtk, perl, libX11, libv4l
-  , qt4, lzma, gtk2, ghostscript
+  , qt4, lzma, gtk2
   , ...}:
 builderDefsPackage
 (a :  
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 35c0d809f43..dfa4cfc3033 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3622,7 +3622,6 @@ let
     pygtk = lib.overrideDerivation pygtk (x: {
       gtk = gtk2;
     });
-    ghostscript = ghostscriptX;
   };
 
   zdelta = callPackage ../tools/compression/zdelta { };