From f05adf46bd7214cab91cbb617189934810c4772e Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 16 Mar 2010 06:44:02 +0000 Subject: [PATCH] Make FlashPlayer9 build for now.. svn path=/nixpkgs/trunk/; revision=20641 --- .../mozilla-plugins/flashplayer-9/builder.sh | 2 ++ .../mozilla-plugins/flashplayer-9/default.nix | 13 ++++++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-9/builder.sh b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-9/builder.sh index 8a0cc3c94fee..0f738eb9cccc 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-9/builder.sh +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-9/builder.sh @@ -3,6 +3,8 @@ source $stdenv/setup dontStrip=1 dontPatchELF=1 +sourceRoot=. + installPhase() { ensureDir $out/lib/mozilla/plugins cp -p libflashplayer.so $out/lib/mozilla/plugins diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-9/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-9/default.nix index 899d9fb48d2d..913aa985583e 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-9/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-9/default.nix @@ -15,6 +15,8 @@ , glib , pango , atk + +, customSrc ? null }: assert stdenv.system == "i686-linux"; @@ -23,10 +25,12 @@ stdenv.mkDerivation { name = "flashplayer-9.0.124.0"; builder = ./builder.sh; - src = fetchurl { - url = http://fpdownload.macromedia.com/get/flashplayer/current/install_flash_player_9_linux.tar.gz; - sha256 = "16p98jf3y9041p8fk6cq7dqj7s4l4m7g9nhvc3dmhmld0075qagl"; - }; + src = if customSrc == null then + fetchurl { + url = http://download.macromedia.com/pub/flashplayer/installers/current/9/install_flash_player_9.tar.gz; + sha256 = "1cnsjgmy7rwj3spzb5mmpmvzxjp435jisl0dd8s4rf4xskyy6d6r"; + } + else customSrc; inherit zlib alsaLib; @@ -40,5 +44,4 @@ stdenv.mkDerivation { description = "Adobe Flash Player browser plugin"; homepage = http://www.adobe.com/products/flashplayer/; }; - }