mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-12-24 03:43:53 +03:00
Update some (seemingly very old) packages that hard-coded the path to make-wrapper.sh
This commit is contained in:
parent
e873877e42
commit
1a0baad6b2
@ -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;
|
||||
}
|
||||
|
@ -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;
|
||||
}
|
||||
|
@ -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";
|
||||
|
@ -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";}
|
||||
|
@ -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;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user