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

* pkgconfig 0.21 is now the default.

Browse Source 
* Some hackery to get Firefox to build again.

svn path=/nixpkgs/trunk/; revision=8076
This commit is contained in:
Eelco Dolstra 2007-02-27 15:15:20 +00:00
parent 8a89f06527
commit 714da445bb
5 changed files with 35 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/applications/networking/browsers/firefox/default.nix
View File

@ -22,7 +22,13 @@ stdenv.mkDerivation {
pkgconfig gtk perl zip libIDL libXi libjpeg libpng zlib cairo pkgconfig gtk perl zip libIDL libXi libjpeg libpng zlib cairo
]; ];
patches = [./writable-copies.patch]; patches = [
./writable-copies.patch
# Ugh, inexplicable problem since GTK+ 2.10. Probably a Firefox
# bug, but I don't know. See
# http://lists.gobolinux.org/pipermail/gobolinux-users/2007-January/004344.html
./xlibs.patch
];
configureFlags = [ configureFlags = [
"--enable-application=browser" "--enable-application=browser"

10
pkgs/applications/networking/browsers/firefox/xlibs.patch Normal file
View File

@ -0,0 +1,10 @@
--- mozilla/layout/build/Makefile.in.orig 2007-01-13 14:23:19.000000000 -0200
+++ mozilla/layout/build/Makefile.in 2007-01-13 14:24:55.000000000 -0200
@@ -282,5 +282,6 @@ LDFLAGS += -Wl,-LD_LAYOUT:lgot_buffer=50
endif
endif
+LDFLAGS += -lX11 -lXrender
export:: $(BUILD_DATE)

10
pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/default.nix
View File

@ -1,19 +1,19 @@
{stdenv, fetchurl, pkgconfig, firefox, libXpm}: {stdenv, fetchurl, pkgconfig, firefox, libXpm, gettext}:
# Note: we shouldn't be dependent on Firefox. The only thing we need # Note: we shouldn't be dependent on Firefox. The only thing we need
# are the include files so that we can access the plugin API (I # are the include files so that we can access the plugin API (I
# think). # think).
(stdenv.mkDerivation { (stdenv.mkDerivation {
name = "mplayerplug-in-3.31"; name = "mplayerplug-in-3.35";
builder = ./builder.sh; builder = ./builder.sh;
src = fetchurl { src = fetchurl {
url = http://nix.cs.uu.nl/dist/tarballs/mplayerplug-in-3.31.tar.gz; url = http://heanet.dl.sourceforge.net/sourceforge/mplayerplug-in/mplayerplug-in-3.35.tar.gz;
md5 = "be26b17cde385c7a34fc634d2c88c5c9"; sha256 = "0zxd2nnmj4n9rkndd614ljv7ylz4f4jqvx1wswqfw5j7hwxm34dw";
}; };
buildInputs = [pkgconfig firefox (firefox.gtk) libXpm]; buildInputs = [pkgconfig firefox (firefox.gtk) libXpm gettext];
inherit firefox; inherit firefox;
}) // {mozillaPlugin = "/lib/mozilla/plugins";} }) // {mozillaPlugin = "/lib/mozilla/plugins";}

9
pkgs/development/tools/misc/pkgconfig/pkgconfig-0.21.nix
View File

@ -8,4 +8,13 @@ stdenv.mkDerivation {
url = http://nix.cs.uu.nl/dist/tarballs/pkg-config-0.21.tar.gz; url = http://nix.cs.uu.nl/dist/tarballs/pkg-config-0.21.tar.gz;
md5 = "476f45fab1504aac6697aa7785f0ab91"; md5 = "476f45fab1504aac6697aa7785f0ab91";
}; };
patches = [
# Process Requires.private properly, see
# http://bugs.freedesktop.org/show_bug.cgi?id=4738.
(fetchurl {
url = http://bugs.freedesktop.org/attachment.cgi?id=8494;
sha256 = "1pcrdbb7dypg2biy0yqc7bdxak5zii8agqljdvk7j4wbyghpqzws";
})
];
} }

6
pkgs/top-level/all-packages.nix
View File

@ -1118,11 +1118,13 @@ rec {
* pkgconfig is optionally taken from the stdenv to allow bootstrapping * pkgconfig is optionally taken from the stdenv to allow bootstrapping
* of glib and pkgconfig itself on MinGW. * of glib and pkgconfig itself on MinGW.
*/ */
pkgconfig = useFromStdenv (stdenv ? pkgconfig) stdenv.pkgconfig pkgconfigOld = useFromStdenv (stdenv ? pkgconfig) stdenv.pkgconfig
(import ../development/tools/misc/pkgconfig { (import ../development/tools/misc/pkgconfig {
inherit fetchurl stdenv; inherit fetchurl stdenv;
}); });
pkgconfig = pkgconfig_latest;
pkgconfig017x = import ../development/tools/misc/pkgconfig/pkgconfig-0.17.2.nix { pkgconfig017x = import ../development/tools/misc/pkgconfig/pkgconfig-0.17.2.nix {
inherit fetchurl stdenv; inherit fetchurl stdenv;
}; };
@ -2732,7 +2734,7 @@ rec {
}; };
MPlayerPlugin = import ../applications/networking/browsers/mozilla-plugins/mplayerplug-in { MPlayerPlugin = import ../applications/networking/browsers/mozilla-plugins/mplayerplug-in {
inherit fetchurl stdenv pkgconfig firefox; inherit fetchurl stdenv pkgconfig firefox gettext;
inherit (xlibs) libXpm; inherit (xlibs) libXpm;
# !!! should depend on MPlayer # !!! should depend on MPlayer
}; };