Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 20ab640aa221
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: b2b29d24f24a
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Mar 2, 2019

  1. ibus: remove gconf dependency from runtime 

    wrapGAppsHook adds gconf to runtime even though we only need
gsettings-schema-convert utility during build.

This decreases the closure size 514M → 394M
    @jtojnar
    jtojnar committed Mar 2, 2019
    Copy the full SHA
    f577861 View commit details

Commits on Mar 5, 2019

  1. Merge pull request #56715 from jtojnar/ibus-no-gconf 

    ibus: remove gconf dependency from runtime
    @jtojnar
    jtojnar authored Mar 5, 2019
    Copy the full SHA
    b2b29d2 View commit details
Showing with 9 additions and 2 deletions.
  1. +9 −2 pkgs/tools/inputmethods/ibus/default.nix
11 changes: 9 additions & 2 deletions pkgs/tools/inputmethods/ibus/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, fetchFromGitHub, autoreconfHook, gconf, intltool, makeWrapper, pkgconfig
{ stdenv, fetchurl, runCommand, fetchFromGitHub, autoreconfHook, gconf, intltool, makeWrapper, pkgconfig
, vala, wrapGAppsHook, dbus, dconf ? null, glib, gdk_pixbuf, gobject-introspection, gtk2
, gtk3, gtk-doc, isocodes, python3, json-glib, libnotify ? null, enablePythonLibrary ? true
, enableUI ? true, withWayland ? false, libxkbcommon ? null, wayland ? null
@@ -59,6 +59,13 @@ let
makeWrapper ${glib.dev}/bin/glib-mkenums $out/bin/glib-mkenums --unset PYTHONPATH
'';
};

# stop gconf from leaking into environment
# can be removed in ibus 1.6 which will not use gconf anymore
gsettings-schema-convert = runCommand "name" {} ''
mkdir -p $out/bin
ln -s ${gconf}/bin/gsettings-schema-convert $out/bin
'';
in

stdenv.mkDerivation rec {
@@ -97,7 +104,7 @@ stdenv.mkDerivation rec {

nativeBuildInputs = [
autoreconfHook
gconf
gsettings-schema-convert
gtk-doc
intltool
makeWrapper