public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update some (seemingly very old) packages that hard-coded the path to make-wrapper.sh

This commit is contained in:
Shea Levy 2012-07-15 03:32:50 -04:00
parent e873877e42
commit 1a0baad6b2
5 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/editors/monodevelop/default.nix
View File

@ -2,7 +2,7 @@
, gtkmozembedsharp, monodoc , gtkmozembedsharp, monodoc
, perl, perlXMLParser, pkgconfig , perl, perlXMLParser, pkgconfig
, glib, gtk, GConf, gnome_vfs, libbonobo, libglade, libgnome , glib, gtk, GConf, gnome_vfs, libbonobo, libglade, libgnome
, mozilla , mozilla, makeWrapper
}: }:
stdenv.mkDerivation { stdenv.mkDerivation {
@ -14,8 +14,6 @@ stdenv.mkDerivation {
md5 = "8c33df5629b0676b7ab552854c1de6fd"; md5 = "8c33df5629b0676b7ab552854c1de6fd";
}; };
makeWrapper = ../../../build-support/make-wrapper/make-wrapper.sh;
patches = [./prefix.patch]; patches = [./prefix.patch];
buildInputs = [ buildInputs = [
@ -24,5 +22,5 @@ stdenv.mkDerivation {
gtkmozembedsharp monodoc gtkmozembedsharp monodoc
]; ];
inherit mozilla monodoc gtksharp gtkmozembedsharp gtksourceviewsharp; inherit mozilla monodoc gtksharp gtkmozembedsharp gtksourceviewsharp makeWrapper;
} }

6
pkgs/applications/editors/monodoc/default.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, mono, gtksharp, pkgconfig}: {stdenv, fetchurl, mono, gtksharp, pkgconfig, makeWrapper}:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "monodoc-1.0.6"; name = "monodoc-1.0.6";
@ -9,9 +9,7 @@ stdenv.mkDerivation {
md5 = "f2fc27e8e4717d90dc7efa2450625693"; md5 = "f2fc27e8e4717d90dc7efa2450625693";
}; };
makeWrapper = ../../../build-support/make-wrapper/make-wrapper.sh;
buildInputs = [mono gtksharp pkgconfig]; buildInputs = [mono gtksharp pkgconfig];
inherit gtksharp; inherit gtksharp makeWrapper;
} }

4
pkgs/applications/graphics/f-spot/default.nix
View File

@ -1,14 +1,16 @@
{ stdenv, fetchurl, perl, perlXMLParser, pkgconfig, mono, libexif { stdenv, fetchurl, perl, perlXMLParser, pkgconfig, mono, libexif
, libgnome, libgnomeui, gtksharp, libjpeg, sqlite, lcms, libgphoto2 , libgnome, libgnomeui, gtksharp, libjpeg, sqlite, lcms, libgphoto2
, monoDLLFixer , monoDLLFixer
, makeWrapper
}: }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "f-spot-0.0.10"; name = "f-spot-0.0.10";
builder = ./builder.sh; builder = ./builder.sh;
makeWrapper = ../../../build-support/make-wrapper/make-wrapper.sh;
inherit makeWrapper;
src = fetchurl { src = fetchurl {
url = http://nixos.org/tarballs/f-spot-0.0.10.tar.bz2; url = http://nixos.org/tarballs/f-spot-0.0.10.tar.bz2;
md5 = "19cc6e067ccc261b0502ff6189b79832"; md5 = "19cc6e067ccc261b0502ff6189b79832";

6
pkgs/applications/video/RealPlayer/default.nix
View File

@ -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. # 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"; md5 = "d28b31261059231a3e93c7466f8153e6";
}; };
makeWrapper = ../../../build-support/make-wrapper/make-wrapper.sh; inherit libstdcpp5 makeWrapper;
inherit libstdcpp5;
libPath = [libstdcpp5 glib pango atk gtk libX11]; libPath = [libstdcpp5 glib pango atk gtk libX11];
}) // {mozillaPlugin = "/real/mozilla";} }) // {mozillaPlugin = "/real/mozilla";}

5
pkgs/misc/maven/maven-1.0.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, jdk}: {stdenv, fetchurl, jdk, makeWrapper}:
assert jdk != null; assert jdk != null;
@ -10,7 +10,6 @@ stdenv.mkDerivation {
url = http://apache.cs.uu.nl/dist/maven/binaries/maven-1.0.2.tar.bz2; url = http://apache.cs.uu.nl/dist/maven/binaries/maven-1.0.2.tar.bz2;
md5 = "81a6b4393e550635efe19e95cea38718"; md5 = "81a6b4393e550635efe19e95cea38718";
}; };
makeWrapper = ../../build-support/make-wrapper/make-wrapper.sh;
inherit jdk; inherit jdk makeWrapper;
} }