summary refs log tree commit diff
diff options
context:
space:
mode:
authoraszlig <aszlig@redmoonstudios.org>2014-06-18 11:59:56 +0200
committeraszlig <aszlig@redmoonstudios.org>2014-06-19 01:51:35 +0200
commit0c50978cb806c7aba6809c9cc14715efd628bac8 (patch)
treefe1226fb1e2568f3f328e82f8b938f442c44c226
parent47214207b92fa5e5592e33c4d2f0326e91c08587 (diff)
downloadnixlib-0c50978cb806c7aba6809c9cc14715efd628bac8.tar
nixlib-0c50978cb806c7aba6809c9cc14715efd628bac8.tar.gz
nixlib-0c50978cb806c7aba6809c9cc14715efd628bac8.tar.bz2
nixlib-0c50978cb806c7aba6809c9cc14715efd628bac8.tar.lz
nixlib-0c50978cb806c7aba6809c9cc14715efd628bac8.tar.xz
nixlib-0c50978cb806c7aba6809c9cc14715efd628bac8.tar.zst
nixlib-0c50978cb806c7aba6809c9cc14715efd628bac8.zip
chromium: Hardcode dlopen() path for libexif.
This is needed for Chromium version 36 and higher.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
-rw-r--r--pkgs/applications/networking/browsers/chromium/common.nix4
1 files changed, 4 insertions, 0 deletions
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index d38bd442184b..3aac5f9b17ae 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -144,6 +144,10 @@ let
       sed -i -e '/base::FilePath exe_dir/,/^ *} *$/c \
         sandbox_binary = base::FilePath(getenv("CHROMIUM_SANDBOX_BINARY_PATH"));
       ' ${toPatch}
+    '' + optionalString (!versionOlder source.version "36.0.0.0") ''
+      sed -i -e '/module_path *=.*libexif.so/ {
+        s|= [^;]*|= base::FilePath().AppendASCII("${libexif}/lib/libexif.so")|
+      }' chrome/utility/media_galleries/image_metadata_extractor.cc
     '';
 
     gypFlags = mkGypFlags (gypFlagsUseSystemLibs // {