alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

added chromeWrapper, like firefoxWrapper, to allow plugins to work, added previously undefined dependencies on flash plugin

Browse source 
svn path=/nixpkgs/trunk/; revision=18050
This commit is contained in:
Rob Vermaas 2009-10-30 12:28:44 +00:00
parent d025709a8a
commit a73cef1057
5 changed files with 56 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/applications/networking/browsers/chromium/default.nix
View file

@ -14,6 +14,7 @@
, libX11
, GConf
, libXext
, libXt
, atk
, makeWrapper
, unzip
@ -44,7 +45,7 @@ stdenv.mkDerivation rec {
libPath =
stdenv.lib.makeLibraryPath
[ stdenv.glibc stdenv.gcc.gcc ffmpeg cairo pango glib libXrender gtk nspr nss fontconfig freetype alsaLib libX11 GConf libXext atk ] ;
[ stdenv.glibc stdenv.gcc.gcc ffmpeg cairo pango glib libXrender gtk nspr nss fontconfig freetype alsaLib libX11 GConf libXext atk libXt] ;
installPhase = ''
ensureDir $out/bin
@ -65,4 +66,7 @@ stdenv.mkDerivation rec {
ln -s ${nspr}/lib/libplc4.so $out/lib/libplc4.so.0d
'';
meta = {
description = "";
};
}

22
pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/default.nix
View file

@ -1,4 +1,22 @@
{stdenv, fetchurl, zlib, alsaLib, curl}:
{ stdenv
, fetchurl
, zlib
, alsaLib
, curl
, nss
, nspr
, fontconfig
, freetype
, expat
, libX11
, libXext
, libXrender
, libXt
, gtk
, glib
, pango
, atk
}:
stdenv.mkDerivation {
name = "flashplayer-10.0.32.18";
@ -23,7 +41,7 @@ stdenv.mkDerivation {
mozillaPlugin = "/lib/mozilla/plugins";
};
rpath = "${zlib}/lib:${alsaLib}/lib:${curl}/lib";
rpath = stdenv.lib.makeLibraryPath [zlib alsaLib curl nss nspr fontconfig freetype expat libX11 libXext libXrender libXt gtk glib pango atk] ;
meta = {
description = "Adobe Flash Player browser plugin";

2
pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-9/builder.sh
View file

@ -6,7 +6,7 @@ dontPatchELF=1
installPhase() {
ensureDir $out/lib/mozilla/plugins
cp -p libflashplayer.so $out/lib/mozilla/plugins
patchelf --set-rpath "$zlib/lib:$alsaLib/lib" $out/lib/mozilla/plugins/libflashplayer.so
patchelf --set-rpath $rpath $out/lib/mozilla/plugins/libflashplayer.so
}
genericBuild

21
pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-9/default.nix
View file

@ -1,4 +1,21 @@
{stdenv, fetchurl, zlib, alsaLib}:
{ stdenv
, fetchurl
, zlib
, alsaLib
, nss
, nspr
, fontconfig
, freetype
, expat
, libX11
, libXext
, libXrender
, libXt
, gtk
, glib
, pango
, atk
}:
assert stdenv.system == "i686-linux";
@ -17,6 +34,8 @@ stdenv.mkDerivation {
mozillaPlugin = "/lib/mozilla/plugins";
};
rpath = stdenv.lib.makeLibraryPath [zlib alsaLib nss nspr fontconfig freetype expat libX11 libXext libXrender libXt gtk glib pango atk] ;
meta = {
description = "Adobe Flash Player browser plugin";
homepage = http://www.adobe.com/products/flashplayer/;

13
pkgs/top-level/all-packages.nix
View file

@ -6574,11 +6574,14 @@ let
chrome = import ../applications/networking/browsers/chromium {
inherit stdenv fetchurl ffmpeg cairo nspr nss fontconfig freetype alsaLib makeWrapper unzip patchelf05;
inherit (xlibs) libX11 libXext libXrender ;
inherit (xlibs) libX11 libXext libXrender libXt ;
inherit (gtkLibs) gtk glib pango atk;
inherit (gnome) GConf;
};
chromeWrapper = wrapFirefox chrome "chrome" "";
cinelerra = import ../applications/video/cinelerra {
inherit fetchurl stdenv
automake autoconf libtool
@ -7020,12 +7023,16 @@ let
flashplayer9 = (
import ../applications/networking/browsers/mozilla-plugins/flashplayer-9 {
inherit fetchurl stdenv zlib alsaLib;
inherit fetchurl stdenv zlib alsaLib nss nspr fontconfig freetype expat;
inherit (xlibs) libX11 libXext libXrender libXt ;
inherit (gtkLibs) gtk glib pango atk;
});
flashplayer10 = (
import ../applications/networking/browsers/mozilla-plugins/flashplayer-10 {
inherit fetchurl stdenv zlib alsaLib curl;
inherit fetchurl stdenv zlib alsaLib curl nss nspr fontconfig freetype expat;
inherit (xlibs) libX11 libXext libXrender libXt ;
inherit (gtkLibs) gtk glib pango atk;
});
flite = import ../applications/misc/flite {