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

Updating flashplayer10 for i686, and adding it for x64.

Browse Source 
I haven't tried the builder for i686, but I think it should work. The fix should be easy in any cas.
I don't think I've written pretty nix code, so I'm looking forward for revision.


svn path=/nixpkgs/trunk/; revision=14324
This commit is contained in:
Lluís Batlle i Rossell 2009-03-04 11:04:16 +00:00
parent fb9ace2e56
commit f3a4388ddc
3 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/builder.sh
View File

@ -3,6 +3,16 @@ source $stdenv/setup
dontStrip=1 dontStrip=1
dontPatchELF=1 dontPatchELF=1
unpackPhase() {
tar xvzf $src;
for a in *; do
if [ -d $a ]; then
cd $a
break
fi
done
}
installPhase() { installPhase() {
ensureDir $out/lib/mozilla/plugins ensureDir $out/lib/mozilla/plugins
cp -p libflashplayer.so $out/lib/mozilla/plugins cp -p libflashplayer.so $out/lib/mozilla/plugins

15
pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/default.nix
View File

@ -1,15 +1,20 @@
{stdenv, fetchurl, zlib, alsaLib, curl}: {stdenv, fetchurl, zlib, alsaLib, curl}:
assert stdenv.system == "i686-linux";
stdenv.mkDerivation { stdenv.mkDerivation {
name = "flashplayer-10.0.12.36"; name = if (stdenv.system == "x86_64-linux") then
"flashplayer-10.0.22.87"
else
"flashplayer-10.0.22";
builder = ./builder.sh; builder = ./builder.sh;
src = fetchurl { src = if (stdenv.system == "x86_64-linux") then fetchurl {
url = http://download.macromedia.com/pub/labs/flashplayer10/libflashplayer-10.0.22.87.linux-x86_64.so.tar.gz;
sha256 = "eac1d05aa96036819fe8f14f293a2ccc9601e1e32e08ec33e6ed9ed698e76145";
}
else fetchurl {
url = http://fpdownload.macromedia.com/get/flashplayer/current/install_flash_player_10_linux.tar.gz; url = http://fpdownload.macromedia.com/get/flashplayer/current/install_flash_player_10_linux.tar.gz;
sha256 = "cd3e8fbb05da4a5303f958cb627bc7f3845dd86576a96ab157effc4f0ae65e5d"; sha256 = "cd29f166c87fecc943e88fe951bb61c56728fab12b4bf343badafa73ea95394e";
}; };
inherit zlib alsaLib; inherit zlib alsaLib;

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

@ -8776,8 +8776,7 @@ let
wrapFirefox = browser: browserName: nameSuffix: import ../applications/networking/browsers/firefox-wrapper { wrapFirefox = browser: browserName: nameSuffix: import ../applications/networking/browsers/firefox-wrapper {
inherit stdenv nameSuffix makeWrapper browser browserName; inherit stdenv nameSuffix makeWrapper browser browserName;
plugins = plugins =
let enableAdobeFlash = getConfig [ browserName "enableAdobeFlash" ] true let enableAdobeFlash = getConfig [ browserName "enableAdobeFlash" ] true;
&& system == "i686-linux";
in in
([] ([]
++ lib.optional (!enableAdobeFlash) gnash ++ lib.optional (!enableAdobeFlash) gnash