diff options
| author | worldofpeace <worldofpeace@protonmail.ch> | 2020-04-24 18:22:59 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-24 18:22:59 -0400 |
| commit | ee5cba24c31896b6aeb0af4e21b93b878e54f747 (patch) | |
| tree | 76fe6763116779df2a530a6b901d41d5f32c60ce /pkgs/tools/inputmethods/ibus | |
| parent | eeb4e522b5d25408faab02c79a34ead8228531c9 (diff) | |
| download | nixpkgs-ee5cba24c31896b6aeb0af4e21b93b878e54f747.tar nixpkgs-ee5cba24c31896b6aeb0af4e21b93b878e54f747.tar.gz nixpkgs-ee5cba24c31896b6aeb0af4e21b93b878e54f747.tar.bz2 nixpkgs-ee5cba24c31896b6aeb0af4e21b93b878e54f747.tar.lz nixpkgs-ee5cba24c31896b6aeb0af4e21b93b878e54f747.tar.xz nixpkgs-ee5cba24c31896b6aeb0af4e21b93b878e54f747.tar.zst nixpkgs-ee5cba24c31896b6aeb0af4e21b93b878e54f747.zip | |
Revert "ibus: fix dconf db installation"
Diffstat (limited to 'pkgs/tools/inputmethods/ibus')
| -rw-r--r-- | pkgs/tools/inputmethods/ibus/default.nix | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/pkgs/tools/inputmethods/ibus/default.nix b/pkgs/tools/inputmethods/ibus/default.nix index 238e133495c..644fd5eef3b 100644 --- a/pkgs/tools/inputmethods/ibus/default.nix +++ b/pkgs/tools/inputmethods/ibus/default.nix @@ -16,7 +16,6 @@ , gtk2 , gtk3 , gtk-doc -, runCommand , isocodes , cldr-emoji-annotation , unicode-character-database @@ -48,14 +47,6 @@ 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 { @@ -80,7 +71,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "installedTests" ]; postPatch = '' - patchShebangs --build data/dconf/make-dconf-override-db.sh + echo \#!${runtimeShell} > data/dconf/make-dconf-override-db.sh cp ${buildPackages.gtk-doc}/share/gtk-doc/data/gtk-doc.make . ''; @@ -114,7 +105,6 @@ stdenv.mkDerivation rec { python3BuildEnv vala wrapGAppsHook - dbus-launch ]; propagatedBuildInputs = [ |