From c036d1d48f4ed8c7f64e355f2dafe350c33fbe16 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 1 Feb 2007 15:07:52 +0000 Subject: * Adobe Reader 7.0.9. * Renamed the Flash Player directories. svn path=/nixpkgs/trunk/; revision=7831 --- pkgs/applications/misc/acrobat-reader/builder.sh | 2 ++ pkgs/applications/misc/acrobat-reader/default.nix | 6 +++--- .../browsers/mozilla-plugins/flashplayer-7/builder.sh | 12 ++++++++++++ .../browsers/mozilla-plugins/flashplayer-7/default.nix | 13 +++++++++++++ .../browsers/mozilla-plugins/flashplayer-9-beta/builder.sh | 12 ------------ .../browsers/mozilla-plugins/flashplayer-9-beta/default.nix | 13 ------------- .../browsers/mozilla-plugins/flashplayer-9/builder.sh | 12 ++++++++++++ .../browsers/mozilla-plugins/flashplayer-9/default.nix | 13 +++++++++++++ .../browsers/mozilla-plugins/flashplayer/builder.sh | 12 ------------ .../browsers/mozilla-plugins/flashplayer/default.nix | 13 ------------- 10 files changed, 55 insertions(+), 53 deletions(-) create mode 100644 pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-7/builder.sh create mode 100644 pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-7/default.nix delete mode 100644 pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-9-beta/builder.sh delete mode 100644 pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-9-beta/default.nix create mode 100644 pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-9/builder.sh create mode 100644 pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-9/default.nix delete mode 100644 pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/builder.sh delete mode 100644 pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix (limited to 'pkgs/applications') diff --git a/pkgs/applications/misc/acrobat-reader/builder.sh b/pkgs/applications/misc/acrobat-reader/builder.sh index d37919858f72..bcbdb85e9766 100644 --- a/pkgs/applications/misc/acrobat-reader/builder.sh +++ b/pkgs/applications/misc/acrobat-reader/builder.sh @@ -25,3 +25,5 @@ done patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ --set-rpath $fullPath \ $out/Reader/intellinux/bin/acroread + +substituteInPlace $out/bin/acroread --replace /lib:/usr/lib /no-such-path diff --git a/pkgs/applications/misc/acrobat-reader/default.nix b/pkgs/applications/misc/acrobat-reader/default.nix index e603141a86c9..deaac7917747 100644 --- a/pkgs/applications/misc/acrobat-reader/default.nix +++ b/pkgs/applications/misc/acrobat-reader/default.nix @@ -5,11 +5,11 @@ }: stdenv.mkDerivation { - name = "acrobat-reader-7.0.1"; + name = "acrobat-reader-7.0.9"; builder = ./builder.sh; src = fetchurl { - url = http://ardownload.adobe.com/pub/adobe/reader/unix/7x/7.0/enu/AdbeRdr701_linux_enu.tar.gz; - md5 = "79e5a40aca6b49f7015cb1694876f87a"; + url = http://ardownload.adobe.com/pub/adobe/reader/unix/7x/7.0.9/enu/AdobeReader_enu-7.0.9-1.i386.tar.gz; + sha256 = "0qs8v57gamkk243f44yqxic93izf0bn2d9l4wwbqqy1jv5s125hy"; }; libPath = [ libXt libXp libXext libX11 glib pango atk gtk libstdcpp5 zlib diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-7/builder.sh b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-7/builder.sh new file mode 100644 index 000000000000..9c8e423ce6df --- /dev/null +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-7/builder.sh @@ -0,0 +1,12 @@ +source $stdenv/setup + +buildPhase=true + +installCommand=myInstall +myInstall() { + mkdir -p $out/lib/mozilla/plugins + cp -p flashplayer.xpt libflashplayer.so $out/lib/mozilla/plugins + echo "$zlib/lib:$libXmu/lib" > $out/lib/mozilla/plugins/extra-library-path +} + +genericBuild diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-7/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-7/default.nix new file mode 100644 index 000000000000..776e926acd5c --- /dev/null +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-7/default.nix @@ -0,0 +1,13 @@ +{stdenv, fetchurl, zlib, libXmu}: + +(stdenv.mkDerivation { + name = "flashplayer-7.0r25"; + + builder = ./builder.sh; + src = fetchurl { + url = http://nix.cs.uu.nl/dist/tarballs/install_flash_player_7_linux.tar.gz; + md5 = "79c59a5ea29347e01c8e6575dd054cd1"; + }; + + inherit zlib libXmu; +}) // {mozillaPlugin = "/lib/mozilla/plugins";} 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 deleted file mode 100644 index 78788a358b00..000000000000 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-9-beta/builder.sh +++ /dev/null @@ -1,12 +0,0 @@ -source $stdenv/setup - -buildPhase=true - -installCommand=myInstall -myInstall() { - mkdir -p $out/lib/mozilla/plugins - cp -p libflashplayer.so $out/lib/mozilla/plugins - 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 deleted file mode 100644 index 3ea8495d7c77..000000000000 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-9-beta/default.nix +++ /dev/null @@ -1,13 +0,0 @@ -{stdenv, fetchurl, zlib, alsaLib}: - -(stdenv.mkDerivation { - name = "flashplayer-9.0.31.0"; - - builder = ./builder.sh; - src = fetchurl { - url = http://fpdownload.macromedia.com/get/flashplayer/current/install_flash_player_9_linux.tar.gz; - sha256 = "0y69n2i8b0zrb5dswhsvb6gls30p42p869vvyvpsg3prwwdrf6z3"; - }; - - inherit zlib alsaLib; -}) // {mozillaPlugin = "/lib/mozilla/plugins";} diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-9/builder.sh b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-9/builder.sh new file mode 100644 index 000000000000..78788a358b00 --- /dev/null +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-9/builder.sh @@ -0,0 +1,12 @@ +source $stdenv/setup + +buildPhase=true + +installCommand=myInstall +myInstall() { + mkdir -p $out/lib/mozilla/plugins + cp -p libflashplayer.so $out/lib/mozilla/plugins + echo "$zlib/lib:$alsaLib/lib" > $out/lib/mozilla/plugins/extra-library-path +} + +genericBuild diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-9/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-9/default.nix new file mode 100644 index 000000000000..3ea8495d7c77 --- /dev/null +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-9/default.nix @@ -0,0 +1,13 @@ +{stdenv, fetchurl, zlib, alsaLib}: + +(stdenv.mkDerivation { + name = "flashplayer-9.0.31.0"; + + builder = ./builder.sh; + src = fetchurl { + url = http://fpdownload.macromedia.com/get/flashplayer/current/install_flash_player_9_linux.tar.gz; + sha256 = "0y69n2i8b0zrb5dswhsvb6gls30p42p869vvyvpsg3prwwdrf6z3"; + }; + + inherit zlib alsaLib; +}) // {mozillaPlugin = "/lib/mozilla/plugins";} diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/builder.sh b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/builder.sh deleted file mode 100644 index 9c8e423ce6df..000000000000 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/builder.sh +++ /dev/null @@ -1,12 +0,0 @@ -source $stdenv/setup - -buildPhase=true - -installCommand=myInstall -myInstall() { - mkdir -p $out/lib/mozilla/plugins - cp -p flashplayer.xpt libflashplayer.so $out/lib/mozilla/plugins - echo "$zlib/lib:$libXmu/lib" > $out/lib/mozilla/plugins/extra-library-path -} - -genericBuild diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix deleted file mode 100644 index 776e926acd5c..000000000000 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix +++ /dev/null @@ -1,13 +0,0 @@ -{stdenv, fetchurl, zlib, libXmu}: - -(stdenv.mkDerivation { - name = "flashplayer-7.0r25"; - - builder = ./builder.sh; - src = fetchurl { - url = http://nix.cs.uu.nl/dist/tarballs/install_flash_player_7_linux.tar.gz; - md5 = "79c59a5ea29347e01c8e6575dd054cd1"; - }; - - inherit zlib libXmu; -}) // {mozillaPlugin = "/lib/mozilla/plugins";} -- cgit 1.4.1