diff options
| author | worldofpeace <worldofpeace@protonmail.ch> | 2020-07-07 11:29:53 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-07 11:29:53 -0400 |
| commit | 56619d6ebb7bef4f379fd909d6909d93b3121131 (patch) | |
| tree | 163fd750ec3d0d582541a3981a3327dd26d0fa6b /pkgs/tools | |
| parent | 812468890686b8fda791d421a912dac8ca06ca4d (diff) | |
| parent | 11d6318a0136536734f48e49b4f4f6b5e08f9b57 (diff) | |
| download | nixpkgs-56619d6ebb7bef4f379fd909d6909d93b3121131.tar nixpkgs-56619d6ebb7bef4f379fd909d6909d93b3121131.tar.gz nixpkgs-56619d6ebb7bef4f379fd909d6909d93b3121131.tar.bz2 nixpkgs-56619d6ebb7bef4f379fd909d6909d93b3121131.tar.lz nixpkgs-56619d6ebb7bef4f379fd909d6909d93b3121131.tar.xz nixpkgs-56619d6ebb7bef4f379fd909d6909d93b3121131.tar.zst nixpkgs-56619d6ebb7bef4f379fd909d6909d93b3121131.zip | |
Merge pull request #85992 from symphorien/ibus-db
ibus: fix dconf database
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/inputmethods/ibus/default.nix | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/pkgs/tools/inputmethods/ibus/default.nix b/pkgs/tools/inputmethods/ibus/default.nix index 644fd5eef3b..238e133495c 100644 --- a/pkgs/tools/inputmethods/ibus/default.nix +++ b/pkgs/tools/inputmethods/ibus/default.nix @@ -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 = [ |