diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2016-05-01 12:25:37 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2016-05-01 12:26:39 +0300 |
| commit | 3a52c5fa7d059ff75b3f56a817832e84f2c96e04 (patch) | |
| tree | 3f785733ff0249648eec195ca48454b4e3244af6 /pkgs/applications/networking/browsers/firefox | |
| parent | 6cf44fed135f0b240a6b7f1082c8f5424acb990f (diff) | |
| download | nixlib-3a52c5fa7d059ff75b3f56a817832e84f2c96e04.tar nixlib-3a52c5fa7d059ff75b3f56a817832e84f2c96e04.tar.gz nixlib-3a52c5fa7d059ff75b3f56a817832e84f2c96e04.tar.bz2 nixlib-3a52c5fa7d059ff75b3f56a817832e84f2c96e04.tar.lz nixlib-3a52c5fa7d059ff75b3f56a817832e84f2c96e04.tar.xz nixlib-3a52c5fa7d059ff75b3f56a817832e84f2c96e04.tar.zst nixlib-3a52c5fa7d059ff75b3f56a817832e84f2c96e04.zip | |
firefox: fix library path
Fixes #15126
Diffstat (limited to 'pkgs/applications/networking/browsers/firefox')
| -rw-r--r-- | pkgs/applications/networking/browsers/firefox/wrapper.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 1904d720dbd3..d859d9a74ec3 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -88,7 +88,7 @@ stdenv.mkDerivation { makeWrapper "${browser}/bin/${browserName}" \ "$out/bin/${browserName}${nameSuffix}" \ --suffix-each MOZ_PLUGIN_PATH ':' "$plugins" \ - --suffix-each LD_LIBRARY_PATH ':' "$libs" \ + --suffix LD_LIBRARY_PATH ':' "$libs" \ --suffix-each GTK_PATH ':' "$gtk_modules" \ --suffix-each LD_PRELOAD ':' "$(cat $(filterExisting $(addSuffix /extra-ld-preload $plugins)))" \ --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH" \ @@ -129,7 +129,7 @@ stdenv.mkDerivation { # Let each plugin tell us (through its `mozillaPlugin') attribute # where to find the plugin in its tree. plugins = map (x: x + x.mozillaPlugin) plugins; - libs = map (x: x + "/lib") libs ++ map (x: x + "/lib64") libs; + libs = lib.makeLibraryPath libs + ":" + lib.makeSearchPathOutputs "lib64" ["lib"] libs; gtk_modules = map (x: x + x.gtkModule) gtk_modules; passthru = { unwrapped = browser; }; |