From e797a476c62a21320739e73df48b0e1a6d18e374 Mon Sep 17 00:00:00 2001 From: Sean Borg Date: Wed, 19 Apr 2023 07:15:05 +0100 Subject: [PATCH] vlc: add wrapGAppsHook Fixes no Gsettings error when trying to open file picker. Following method mentioned in https://github.com/NixOS/nixpkgs/issues/16285 --- pkgs/applications/video/vlc/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index 457aa7a0da5..fd263557d48 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -71,7 +71,7 @@ , onlyLibVLC ? false , skins2Support ? !onlyLibVLC, freetype , waylandSupport ? true, wayland, wayland-protocols -, withQt5 ? true, qtbase, qtsvg, qtwayland, qtx11extras, wrapQtAppsHook +, withQt5 ? true, qtbase, qtsvg, qtwayland, qtx11extras, wrapQtAppsHook, wrapGAppsHook }: # chromecastSupport requires TCP port 8010 to be open for it to work. @@ -177,6 +177,7 @@ stdenv.mkDerivation rec { pkg-config removeReferencesTo unzip + wrapGAppsHook ] ++ optionals withQt5 [ wrapQtAppsHook ] ++ optionals waylandSupport [ wayland wayland-protocols ]; @@ -209,6 +210,14 @@ stdenv.mkDerivation rec { /usr/share/fonts/truetype/freefont ${freefont_ttf}/share/fonts/truetype ''; + + # to prevent double wrapping of Qtwrap and Gwrap + dontWrapGApps = true; + + preFixup = '' + qtWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + # - Touch plugins (plugins cache keyed off mtime and file size: # https://github.com/NixOS/nixpkgs/pull/35124#issuecomment-370552830 # - Remove references to the Qt development headers (used in error messages)