diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2008-06-14 21:42:07 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2008-06-14 21:42:07 +0000 |
| commit | faba06ce549950a2fe20bd152263a2eedd0e2d34 (patch) | |
| tree | faf1a47b95f0e4d760662d34831ca8317f361874 /pkgs/top-level | |
| parent | 7219a09001291ef236ad8ac02713096bec0d0c08 (diff) | |
| download | nixlib-faba06ce549950a2fe20bd152263a2eedd0e2d34.tar nixlib-faba06ce549950a2fe20bd152263a2eedd0e2d34.tar.gz nixlib-faba06ce549950a2fe20bd152263a2eedd0e2d34.tar.bz2 nixlib-faba06ce549950a2fe20bd152263a2eedd0e2d34.tar.lz nixlib-faba06ce549950a2fe20bd152263a2eedd0e2d34.tar.xz nixlib-faba06ce549950a2fe20bd152263a2eedd0e2d34.tar.zst nixlib-faba06ce549950a2fe20bd152263a2eedd0e2d34.zip | |
* firefox-wrapper: plugins no longer have to declare additional
LD_LIBRARY_PATH elements, since they can use patchelf --rpath if necessary. * Flashplayer / JRE: do just that. * JRE: libstdcpp5 no longer seems to be necessary for the plugin. svn path=/nixpkgs/trunk/; revision=12094
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b5c0a3872d19..6069f0d9d8d4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1614,7 +1614,6 @@ let pkgs = rec { assert supportsJDK; (if pluginSupport then appendToName "plugin" else x: x) (import ../development/compilers/jdk { inherit fetchurl stdenv unzip installjdk xlibs pluginSupport makeWrapper; - libstdcpp5 = gcc33.gcc; }); jikes = import ../development/compilers/jikes { @@ -6544,7 +6543,7 @@ let pkgs = rec { }; wrapFirefox = firefox: nameSuffix: import ../applications/networking/browsers/firefox-wrapper { - inherit stdenv firefox nameSuffix; + inherit stdenv firefox nameSuffix makeWrapper; plugins = let enableAdobeFlash = getConfig [ "firefox" "enableAdobeFlash" ] false && system == "i686-linux"; |