diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2007-01-24 18:01:00 +0000 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2007-01-24 18:01:00 +0000 |
commit | f752af26372d9b5c6cae0bcab997500c6a468b00 (patch) | |
tree | 1e5f268f67021529501a3fc72e738c33e8b72fb8 | |
parent | 1e38eaa5cbfc9512bddbf4555d898df10fb8f109 (diff) | |
download | nixpkgs-f752af26372d9b5c6cae0bcab997500c6a468b00.tar nixpkgs-f752af26372d9b5c6cae0bcab997500c6a468b00.tar.gz nixpkgs-f752af26372d9b5c6cae0bcab997500c6a468b00.tar.bz2 nixpkgs-f752af26372d9b5c6cae0bcab997500c6a468b00.tar.lz nixpkgs-f752af26372d9b5c6cae0bcab997500c6a468b00.tar.xz nixpkgs-f752af26372d9b5c6cae0bcab997500c6a468b00.tar.zst nixpkgs-f752af26372d9b5c6cae0bcab997500c6a468b00.zip |
* Flash Player 9 final. Also fixed sound support (it needs ALSA).
svn path=/nixpkgs/trunk/; revision=7794
3 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-9-beta/builder.sh b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-9-beta/builder.sh index f6376af1370..78788a358b0 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-9-beta/builder.sh +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-9-beta/builder.sh @@ -6,7 +6,7 @@ installCommand=myInstall myInstall() { mkdir -p $out/lib/mozilla/plugins cp -p libflashplayer.so $out/lib/mozilla/plugins - echo "$zlib/lib" > $out/lib/mozilla/plugins/extra-library-path + echo "$zlib/lib:$alsaLib/lib" > $out/lib/mozilla/plugins/extra-library-path } genericBuild diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-9-beta/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-9-beta/default.nix index e58ea542c6c..3ea8495d7c7 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-9-beta/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-9-beta/default.nix @@ -1,13 +1,13 @@ -{stdenv, fetchurl, zlib}: +{stdenv, fetchurl, zlib, alsaLib}: (stdenv.mkDerivation { - name = "flashplayer-9.0.21.78-pre-beta-112006"; + name = "flashplayer-9.0.31.0"; builder = ./builder.sh; src = fetchurl { - url = http://download.macromedia.com/pub/labs/flashplayer9_update/FP9_plugin_beta_112006.tar.gz; - md5 = "3ab408f85ae6d8180cc913edf97bf3eb"; + url = http://fpdownload.macromedia.com/get/flashplayer/current/install_flash_player_9_linux.tar.gz; + sha256 = "0y69n2i8b0zrb5dswhsvb6gls30p42p869vvyvpsg3prwwdrf6z3"; }; - inherit zlib; + inherit zlib alsaLib; }) // {mozillaPlugin = "/lib/mozilla/plugins";} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f640640448d..0df66b59f80 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2550,7 +2550,7 @@ rec { }; flashplayer9beta = import ../applications/networking/browsers/mozilla-plugins/flashplayer-9-beta { - inherit fetchurl stdenv zlib; + inherit fetchurl stdenv zlib alsaLib; # inherit (xlibs) libXmu; }; |