Author: viric
Date: Sat Dec 3 15:16:17 2011
New Revision: 30712
URL: https://nixos.org/websvn/nix/?rev=30712&sc=1
Log:
Adding flashplayer11. It builds fine for me on x86_64.
Patch by Eduard Carreras.
Added:
nixpkgs/trunk/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/
nixpkgs/trunk/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/builder.sh
nixpkgs/trunk/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix
Modified:
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Added:
nixpkgs/trunk/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/builder.sh
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++
nixpkgs/trunk/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/builder.sh
Sat Dec 3 15:16:17 2011 (r30712)
@@ -0,0 +1,23 @@
+source $stdenv/setup
+
+dontStrip=1
+dontPatchELF=1
+sourceRoot=$TMPDIR
+
+unpackPhase() {
+ tar xvzf $src;
+ for a in *; do
+ if [ -d $a ]; then
+ cd $a
+ break
+ fi
+ done
+}
+
+installPhase() {
+ ensureDir $out/lib/mozilla/plugins
+ cp -pv libflashplayer.so $out/lib/mozilla/plugins
+ patchelf --set-rpath "$rpath" $out/lib/mozilla/plugins/libflashplayer.so
+}
+
+genericBuild
Added:
nixpkgs/trunk/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++
nixpkgs/trunk/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix
Sat Dec 3 15:16:17 2011 (r30712)
@@ -0,0 +1,88 @@
+{ stdenv
+, fetchurl
+, zlib
+, alsaLib
+, curl
+, nss
+, nspr
+, fontconfig
+, freetype
+, expat
+, libX11
+, libXext
+, libXrender
+, libXt
+, gtk
+, glib
+, pango
+, cairo
+, atk
+, gdk_pixbuf
+, debug ? false
+
+/* you have to add ~/mm.cfg :
+
+ TraceOutputFileEnable=1
+ ErrorReportingEnable=1
+ MaxWarnings=1
+
+ in order to read the flash trace at
~/.macromedia/Flash_Player/Logs/flashlog.txt
+ Then FlashBug (a FireFox plugin) shows the log as well
+*/
+
+}:
+
+let
+
+ src =
+ if stdenv.system == "x86_64-linux" then
+ if debug then
+ # no plans to provide a x86_64 version:
+ # http://labs.adobe.com/technologies/flashplayer10/faq.html
+ throw "no x86_64 debugging version available"
+ else {
+ # -> http://labs.adobe.com/downloads/flashplayer10.html
+ version = "11.1.102.55";
+ url =
http://fpdownload.macromedia.com/get/flashplayer/pdc/11.1.102.55/install_flash_player_11_linux.x86_64.tar.gz;
+ sha256 = "09swldv174z23pnixy9fxkw084qkl3bbrxfpf159fbjdgvwihn1l";
+ }
+ else if stdenv.system == "i686-linux" then
+ if debug then {
+ # The debug version also contains a player
+ version = "11.1";
+ url =
http://fpdownload.macromedia.com/pub/flashplayer/updaters/11/flashplayer_11_plugin_debug.i386.tar.gz;
+ sha256 = "1z3649lv9sh7jnwl8d90a293nkaswagj2ynhsr4xmwiy7c0jz2lk";
+ } else {
+ version = "11.1.102.55";
+ url =
"http://fpdownload.macromedia.com/get/flashplayer/pdc/11.1.102.55/install_flash_player_11_linux.i386.tar.gz";;
+ sha256 = "08zdnl06lqyk2k3yq4lgphqd3ci2267448mghlv1p0hjrdq253k7";
+ }
+ else throw "Flash Player is not supported on this platform";
+
+in
+
+stdenv.mkDerivation {
+ name = "flashplayer-${src.version}";
+
+ builder = ./builder.sh;
+
+ src = fetchurl { inherit (src) url sha256; };
+
+ inherit zlib alsaLib;
+
+ passthru = {
+ mozillaPlugin = "/lib/mozilla/plugins";
+ };
+
+ rpath = stdenv.lib.makeLibraryPath
+ [ zlib alsaLib curl nss nspr fontconfig freetype expat libX11
+ libXext libXrender libXt gtk glib pango atk cairo gdk_pixbuf
+ ];
+
+ buildPhase = ":";
+
+ meta = {
+ description = "Adobe Flash Player browser plugin";
+ homepage = http://www.adobe.com/products/flashplayer/;
+ };
+}
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Sat Dec 3 15:04:05
2011 (r30711)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Sat Dec 3 15:16:17
2011 (r30712)
@@ -6680,7 +6680,7 @@
flac = callPackage ../applications/audio/flac { };
- flashplayer = flashplayer10;
+ flashplayer = flashplayer11;
flashplayer9 = callPackage
../applications/networking/browsers/mozilla-plugins/flashplayer-9 {
inherit (gtkLibs) atk;
@@ -6690,6 +6690,11 @@
inherit (gtkLibs) atk gdk_pixbuf;
debug = getConfig ["flashplayer" "debug"] false;
};
+
+ flashplayer11 = callPackage
../applications/networking/browsers/mozilla-plugins/flashplayer-11 {
+ inherit (gtkLibs) atk gdk_pixbuf;
+ debug = getConfig ["flashplayer" "debug"] false;
+ };
freecad = callPackage ../applications/graphics/freecad {
boost = boost146;
_______________________________________________
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
