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

ibus: fix generation of 00-upstream-settings

Browse Source
This commit is contained in:
Symphorien Gibol 2020-04-23 12:00:00 +00:00
parent 22a3bf9fb9
commit bd6c12ba32
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/tools/inputmethods/ibus/default.nix
View File

@ -16,6 +16,7 @@
, gtk2 , gtk2
, gtk3 , gtk3
, gtk-doc , gtk-doc
, runCommand
, isocodes , isocodes
, cldr-emoji-annotation , cldr-emoji-annotation
, unicode-character-database , unicode-character-database
@ -47,6 +48,14 @@ let
makeWrapper ${glib.dev}/bin/glib-mkenums $out/bin/glib-mkenums --unset PYTHONPATH 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 in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -71,7 +80,7 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" "installedTests" ]; outputs = [ "out" "dev" "installedTests" ];
postPatch = '' 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 . cp ${buildPackages.gtk-doc}/share/gtk-doc/data/gtk-doc.make .
''; '';
@ -105,6 +114,7 @@ stdenv.mkDerivation rec {
python3BuildEnv python3BuildEnv
vala vala
wrapGAppsHook wrapGAppsHook
dbus-launch
]; ];
propagatedBuildInputs = [ propagatedBuildInputs = [