summary refs log tree commit diff
path: root/pkgs/applications/networking/browsers
diff options
context:
space:
mode:
authorLukas Werling <lukas.werling@gmail.com>2017-07-12 11:53:53 +0200
committerLukas Werling <lukas.werling@gmail.com>2017-07-25 14:25:09 +0200
commit93050a3120604757a5e0d0800d9e6b80317a539b (patch)
treecc4b44e8223b7f6bddfcfc6836613c79a987d7bb /pkgs/applications/networking/browsers
parentd6f3cfecfbd442a1e1d27c444a47464c10939916 (diff)
downloadnixlib-93050a3120604757a5e0d0800d9e6b80317a539b.tar
nixlib-93050a3120604757a5e0d0800d9e6b80317a539b.tar.gz
nixlib-93050a3120604757a5e0d0800d9e6b80317a539b.tar.bz2
nixlib-93050a3120604757a5e0d0800d9e6b80317a539b.tar.lz
nixlib-93050a3120604757a5e0d0800d9e6b80317a539b.tar.xz
nixlib-93050a3120604757a5e0d0800d9e6b80317a539b.tar.zst
nixlib-93050a3120604757a5e0d0800d9e6b80317a539b.zip
vivaldi: fix file dialog crash
When trying to open or save a file using the file chooser GUI, Vivaldi
would crash with the message

   GLib-GIO-ERROR **: Settings schema 'org.gtk.Settings.FileChooser' is
   not installed

This commit adds the GTK directory to XDG_DATA_DIRS which fixes the
crash.
Diffstat (limited to 'pkgs/applications/networking/browsers')
-rw-r--r--pkgs/applications/networking/browsers/vivaldi/default.nix6
1 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix
index c3edc0f4d618..d5006eec3ab1 100644
--- a/pkgs/applications/networking/browsers/vivaldi/default.nix
+++ b/pkgs/applications/networking/browsers/vivaldi/default.nix
@@ -6,7 +6,7 @@
 , gstreamer, gst-plugins-base, libxml2
 , glib, gtk3, pango, gdk_pixbuf, cairo, atk, gnome3
 , nss, nspr
-, patchelf
+, patchelf, makeWrapper
 , proprietaryCodecs ? true, vivaldi-ffmpeg-codecs ? null
 }:
 
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     tar -xvf data.tar.xz
   '';
 
-  nativeBuildInputs = [ patchelf ];
+  nativeBuildInputs = [ patchelf makeWrapper ];
 
   buildInputs = [
     stdenv.cc.cc stdenv.cc.libc zlib libX11 libXt libXext libSM libICE libxcb
@@ -72,6 +72,8 @@ stdenv.mkDerivation rec {
         "$out"/opt/vivaldi/product_logo_''${d}.png \
         "$out"/share/icons/hicolor/''${d}x''${d}/apps/vivaldi.png
     done
+    wrapProgram "$out/bin/vivaldi" \
+      --suffix XDG_DATA_DIRS : ${gtk3}/share/gsettings-schemas/${gtk3.name}/
   '';
 
   meta = with stdenv.lib; {