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/applications | |
| 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/applications')
4 files changed, 14 insertions, 18 deletions
diff --git a/pkgs/applications/networking/browsers/firefox-wrapper/builder.sh b/pkgs/applications/networking/browsers/firefox-wrapper/builder.sh deleted file mode 100644 index 4e2f1c5e8f13..000000000000 --- a/pkgs/applications/networking/browsers/firefox-wrapper/builder.sh +++ /dev/null @@ -1,7 +0,0 @@ -source $stdenv/setup -source $makeWrapper - -makeWrapper "$firefox/bin/firefox" "$out/bin/firefox$nameSuffix" \ - --suffix-each MOZ_PLUGIN_PATH ':' "$plugins" \ - --suffix-contents LD_LIBRARY_PATH ':' "$(filterExisting $(addSuffix /extra-library-path $plugins))" \ - --suffix-contents PATH ':' "$(filterExisting $(addSuffix /extra-bin-path $plugins))" diff --git a/pkgs/applications/networking/browsers/firefox-wrapper/default.nix b/pkgs/applications/networking/browsers/firefox-wrapper/default.nix index 0b1756f21f23..69052d1e89a9 100644 --- a/pkgs/applications/networking/browsers/firefox-wrapper/default.nix +++ b/pkgs/applications/networking/browsers/firefox-wrapper/default.nix @@ -1,14 +1,15 @@ -args: with args; +{stdenv, firefox, nameSuffix ? "", makeWrapper, plugins}: stdenv.mkDerivation { name = firefox.name + "-with-plugins"; - builder = ./builder.sh; - makeWrapper = ../../../../build-support/make-wrapper/make-wrapper.sh; + buildInputs = [makeWrapper]; - inherit firefox; - - nameSuffix = (if args ? nameSuffix then args.nameSuffix else ""); + buildCommand = '' + makeWrapper "${firefox}/bin/firefox" "$out/bin/firefox${nameSuffix}" \ + --suffix-each MOZ_PLUGIN_PATH ':' "$plugins" \ + --suffix-contents PATH ':' "$(filterExisting $(addSuffix /extra-bin-path $plugins))" + ''; # Let each plugin tell us (through its `mozillaPlugin') attribute # where to find the plugin in its tree. 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 78788a358b00..eeb7e7ecbee0 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-9/builder.sh +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-9/builder.sh @@ -2,11 +2,13 @@ source $stdenv/setup buildPhase=true -installCommand=myInstall -myInstall() { - mkdir -p $out/lib/mozilla/plugins +dontStrip=1 +dontPatchELF=1 + +installPhase() { + ensureDir $out/lib/mozilla/plugins cp -p libflashplayer.so $out/lib/mozilla/plugins - echo "$zlib/lib:$alsaLib/lib" > $out/lib/mozilla/plugins/extra-library-path + patchelf --set-rpath "$zlib/lib:$alsaLib/lib" $out/lib/mozilla/plugins/libflashplayer.so } genericBuild diff --git a/pkgs/applications/video/RealPlayer/builder.sh b/pkgs/applications/video/RealPlayer/builder.sh index 298054916317..6a0276d01e4c 100644 --- a/pkgs/applications/video/RealPlayer/builder.sh +++ b/pkgs/applications/video/RealPlayer/builder.sh @@ -16,5 +16,5 @@ makeWrapper "$out/real/realplay.bin" "$out/bin/realplay" \ --set HELIX_LIBS "$out/real" \ --suffix-each LD_LIBRARY_PATH ':' "$(addSuffix /lib $libPath)" -echo "$libstdcpp5/lib" > $out/real/mozilla/extra-library-path +#echo "$libstdcpp5/lib" > $out/real/mozilla/extra-library-path # !!! must be updated, use patchelf --rpath echo "$out/bin" > $out/real/mozilla/extra-bin-path |