vlc: add wrapGAppsHook
Fixes no Gsettings error when trying to open file picker. Following method mentioned in https://github.com/NixOS/nixpkgs/issues/16285
This commit is contained in:
parent
50d922a5ae
commit
e797a476c6
|
@ -71,7 +71,7 @@
|
||||||
, onlyLibVLC ? false
|
, onlyLibVLC ? false
|
||||||
, skins2Support ? !onlyLibVLC, freetype
|
, skins2Support ? !onlyLibVLC, freetype
|
||||||
, waylandSupport ? true, wayland, wayland-protocols
|
, 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.
|
# chromecastSupport requires TCP port 8010 to be open for it to work.
|
||||||
|
@ -177,6 +177,7 @@ stdenv.mkDerivation rec {
|
||||||
pkg-config
|
pkg-config
|
||||||
removeReferencesTo
|
removeReferencesTo
|
||||||
unzip
|
unzip
|
||||||
|
wrapGAppsHook
|
||||||
]
|
]
|
||||||
++ optionals withQt5 [ wrapQtAppsHook ]
|
++ optionals withQt5 [ wrapQtAppsHook ]
|
||||||
++ optionals waylandSupport [ wayland wayland-protocols ];
|
++ optionals waylandSupport [ wayland wayland-protocols ];
|
||||||
|
@ -209,6 +210,14 @@ stdenv.mkDerivation rec {
|
||||||
/usr/share/fonts/truetype/freefont ${freefont_ttf}/share/fonts/truetype
|
/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:
|
# - Touch plugins (plugins cache keyed off mtime and file size:
|
||||||
# https://github.com/NixOS/nixpkgs/pull/35124#issuecomment-370552830
|
# https://github.com/NixOS/nixpkgs/pull/35124#issuecomment-370552830
|
||||||
# - Remove references to the Qt development headers (used in error messages)
|
# - Remove references to the Qt development headers (used in error messages)
|
||||||
|
|
Loading…
Reference in a new issue