public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

googleearth-pro: fix xkb keyboard

This commit is contained in:
SCOTT-HAMILTON 2021-04-23 21:35:52 +02:00
parent cbc9a5a0de
commit db06981716
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/applications/misc/googleearth-pro/default.nix
View File

@ -1,6 +1,7 @@
{ lib, stdenv, fetchurl, glibc, libGLU, libGL, freetype, glib, libSM, libICE, libXi, libXv { lib, stdenv, fetchurl, glibc, libGLU, libGL, freetype, glib, libSM, libICE, libXi, libXv
, libXrender, libXrandr, libXfixes, libXcursor, libXinerama, libXext, libX11, libXcomposite , libXrender, libXrandr, libXfixes, libXcursor, libXinerama, libXext, libX11, libXcomposite
, libxcb, sqlite, zlib, fontconfig, dpkg, libproxy, libxml2, gst_all_1, dbus, makeWrapper }: , libxcb, sqlite, zlib, fontconfig, dpkg, libproxy, libxml2, gst_all_1, dbus, makeWrapper
, xkeyboardconfig }:
let let
arch = arch =
@ -45,6 +46,7 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ dpkg makeWrapper ]; nativeBuildInputs = [ dpkg makeWrapper ];
propagatedBuildInputs = [ xkeyboardconfig ];
doInstallCheck = true; doInstallCheck = true;
@ -97,7 +99,9 @@ stdenv.mkDerivation rec {
# wayland is not supported by Qt included in binary package, so make sure it uses xcb # wayland is not supported by Qt included in binary package, so make sure it uses xcb
fixupPhase = '' fixupPhase = ''
wrapProgram $out/bin/googleearth-pro --set QT_QPA_PLATFORM xcb wrapProgram $out/bin/googleearth-pro \
--set QT_QPA_PLATFORM xcb \
--set QT_XKB_CONFIG_ROOT "${xkeyboardconfig}/share/X11/xkb"
''; '';