ibus: fix generation of 00-upstream-settings
This commit is contained in:
parent
22a3bf9fb9
commit
bd6c12ba32
@ -16,6 +16,7 @@
|
||||
, gtk2
|
||||
, gtk3
|
||||
, gtk-doc
|
||||
, runCommand
|
||||
, isocodes
|
||||
, cldr-emoji-annotation
|
||||
, unicode-character-database
|
||||
@ -47,6 +48,14 @@ let
|
||||
makeWrapper ${glib.dev}/bin/glib-mkenums $out/bin/glib-mkenums --unset PYTHONPATH
|
||||
'';
|
||||
};
|
||||
# make-dconf-override-db.sh needs to execute dbus-launch in the sandbox,
|
||||
# it will fail to read /etc/dbus-1/session.conf unless we add this flag
|
||||
dbus-launch = runCommand "sandbox-dbus-launch" {
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
} ''
|
||||
makeWrapper ${dbus}/bin/dbus-launch $out/bin/dbus-launch \
|
||||
--add-flags --config-file=${dbus.daemon}/share/dbus-1/session.conf
|
||||
'';
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -71,7 +80,7 @@ stdenv.mkDerivation rec {
|
||||
outputs = [ "out" "dev" "installedTests" ];
|
||||
|
||||
postPatch = ''
|
||||
echo \#!${runtimeShell} > data/dconf/make-dconf-override-db.sh
|
||||
patchShebangs --build data/dconf/make-dconf-override-db.sh
|
||||
cp ${buildPackages.gtk-doc}/share/gtk-doc/data/gtk-doc.make .
|
||||
'';
|
||||
|
||||
@ -105,6 +114,7 @@ stdenv.mkDerivation rec {
|
||||
python3BuildEnv
|
||||
vala
|
||||
wrapGAppsHook
|
||||
dbus-launch
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
Loading…
Reference in New Issue
Block a user