From 1a0baad6b20d36c6bd80799a3f6bc4529e236f4f Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sun, 15 Jul 2012 03:32:50 -0400
Subject: [PATCH] Update some (seemingly very old) packages that hard-coded the
 path to make-wrapper.sh

---
 pkgs/applications/editors/monodevelop/default.nix | 6 ++----
 pkgs/applications/editors/monodoc/default.nix     | 6 ++----
 pkgs/applications/graphics/f-spot/default.nix     | 4 +++-
 pkgs/applications/video/RealPlayer/default.nix    | 6 ++----
 pkgs/misc/maven/maven-1.0.nix                     | 5 ++---
 5 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/pkgs/applications/editors/monodevelop/default.nix b/pkgs/applications/editors/monodevelop/default.nix
index e4dc00ff0a13..c823ecfdf83e 100644
--- a/pkgs/applications/editors/monodevelop/default.nix
+++ b/pkgs/applications/editors/monodevelop/default.nix
@@ -2,7 +2,7 @@
 , gtkmozembedsharp, monodoc
 , perl, perlXMLParser, pkgconfig
 , glib, gtk, GConf, gnome_vfs, libbonobo, libglade, libgnome
-, mozilla
+, mozilla, makeWrapper
 }:
 
 stdenv.mkDerivation {
@@ -14,8 +14,6 @@ stdenv.mkDerivation {
     md5 = "8c33df5629b0676b7ab552854c1de6fd";
   };
 
-  makeWrapper = ../../../build-support/make-wrapper/make-wrapper.sh;
-  
   patches = [./prefix.patch];
   
   buildInputs = [
@@ -24,5 +22,5 @@ stdenv.mkDerivation {
     gtkmozembedsharp monodoc
   ];
   
-  inherit mozilla monodoc gtksharp gtkmozembedsharp gtksourceviewsharp;
+  inherit mozilla monodoc gtksharp gtkmozembedsharp gtksourceviewsharp makeWrapper;
 }
diff --git a/pkgs/applications/editors/monodoc/default.nix b/pkgs/applications/editors/monodoc/default.nix
index db8b2e478846..8f6b6d6024c5 100644
--- a/pkgs/applications/editors/monodoc/default.nix
+++ b/pkgs/applications/editors/monodoc/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, mono, gtksharp, pkgconfig}:
+{stdenv, fetchurl, mono, gtksharp, pkgconfig, makeWrapper}:
 
 stdenv.mkDerivation {
   name = "monodoc-1.0.6";
@@ -9,9 +9,7 @@ stdenv.mkDerivation {
     md5 = "f2fc27e8e4717d90dc7efa2450625693";
   };
 
-  makeWrapper = ../../../build-support/make-wrapper/make-wrapper.sh;
-
   buildInputs = [mono gtksharp pkgconfig];
 
-  inherit gtksharp;
+  inherit gtksharp makeWrapper;
 }
diff --git a/pkgs/applications/graphics/f-spot/default.nix b/pkgs/applications/graphics/f-spot/default.nix
index 17a3cd22a5fa..856795ea3562 100644
--- a/pkgs/applications/graphics/f-spot/default.nix
+++ b/pkgs/applications/graphics/f-spot/default.nix
@@ -1,14 +1,16 @@
 { stdenv, fetchurl, perl, perlXMLParser, pkgconfig, mono, libexif
 , libgnome, libgnomeui, gtksharp, libjpeg, sqlite, lcms, libgphoto2
 , monoDLLFixer
+, makeWrapper
 }:
 
 stdenv.mkDerivation {
   name = "f-spot-0.0.10";
 
   builder = ./builder.sh;
-  makeWrapper = ../../../build-support/make-wrapper/make-wrapper.sh;
   
+  inherit makeWrapper;
+
   src = fetchurl {
     url = http://nixos.org/tarballs/f-spot-0.0.10.tar.bz2;
     md5 = "19cc6e067ccc261b0502ff6189b79832";
diff --git a/pkgs/applications/video/RealPlayer/default.nix b/pkgs/applications/video/RealPlayer/default.nix
index 12d98bc3362e..968846f1dcb1 100644
--- a/pkgs/applications/video/RealPlayer/default.nix
+++ b/pkgs/applications/video/RealPlayer/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, libstdcpp5, glib, pango, atk, gtk, libX11}:
+{stdenv, fetchurl, libstdcpp5, glib, pango, atk, gtk, libX11, makeWrapper}:
 
 # Note that RealPlayer 10 need libstdc++.so.5, i.e., GCC 3.3, not 3.4.
 
@@ -13,9 +13,7 @@ assert stdenv.system == "i686-linux";
     md5 = "d28b31261059231a3e93c7466f8153e6";
   };
 
-  makeWrapper = ../../../build-support/make-wrapper/make-wrapper.sh;
-
-  inherit libstdcpp5;
+  inherit libstdcpp5 makeWrapper;
   libPath = [libstdcpp5 glib pango atk gtk libX11];
   
 }) // {mozillaPlugin = "/real/mozilla";}
diff --git a/pkgs/misc/maven/maven-1.0.nix b/pkgs/misc/maven/maven-1.0.nix
index 2c84b6f006cb..48058081f0c3 100644
--- a/pkgs/misc/maven/maven-1.0.nix
+++ b/pkgs/misc/maven/maven-1.0.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, jdk}:
+{stdenv, fetchurl, jdk, makeWrapper}:
 
 assert jdk != null;
 
@@ -10,7 +10,6 @@ stdenv.mkDerivation {
 		url = http://apache.cs.uu.nl/dist/maven/binaries/maven-1.0.2.tar.bz2;
 		md5 = "81a6b4393e550635efe19e95cea38718";
 	};
-	makeWrapper = ../../build-support/make-wrapper/make-wrapper.sh;
 	
-	inherit jdk;
+	inherit jdk makeWrapper;
 }