commit a0c91d66f1d63192a8145e5d0314eaa701542604 · pyrox.dev/nixpkgs

+41

nixos/modules/config/gtk-exe-env.nix

···

       1
       1
       +
       { config, pkgs, lib, ... }:

     

       2
       2
       +
       

     

       3
       3
       +
       {

     

       4
       4
       +
         imports = [

     

       5
       5
       +
         ];

     

       6
       6
       +
       

     

       7
       7
       +
         options = {

     

       8
       8
       +
           gtkPlugins = lib.mkOption {

     

       9
       9
       +
             type = lib.types.listOf lib.types.path;

     

       10
       10
       +
             default = [];

     

       11
       11
       +
             description = ''

     

       12
       12
       +
               Plugin packages for GTK+ such as input methods.

     

       13
       13
       +
             '';

     

       14
       14
       +
           };

     

       15
       15
       +
         };

     

       16
       16
       +
       

     

       17
       17
       +
         config = {

     

       18
       18
       +
           environment.variables = if builtins.length config.gtkPlugins > 0

     

       19
       19
       +
             then

     

       20
       20
       +
               let

     

       21
       21
       +
                 paths = [ pkgs.gtk2 pkgs.gtk3 ] ++ config.gtkPlugins;

     

       22
       22
       +
                 env = pkgs.buildEnv {

     

       23
       23
       +
                   name = "gtk-exe-env";

     

       24
       24
       +
       

     

       25
       25
       +
                   inherit paths;

     

       26
       26
       +
       

     

       27
       27
       +
                   postBuild = lib.concatStringsSep "\n"

     

       28
       28
       +
                     (map (d: d.gtkExeEnvPostBuild or "") paths);

     

       29
       29
       +
       

     

       30
       30
       +
                   ignoreCollisions = true;

     

       31
       31
       +
                 };

     

       32
       32
       +
               in {

     

       33
       33
       +
                 GTK_EXE_PREFIX = builtins.toString env;

     

       34
       34
       +
                 GTK_PATH = [

     

       35
       35
       +
                   "${env}/lib/gtk-2.0"

     

       36
       36
       +
                   "${env}/lib/gtk-3.0"

     

       37
       37
       +
                 ];

     

       38
       38
       +
               }

     

       39
       39
       +
             else {};

     

       40
       40
       +
         };

     

       41
       41
       +
       }

+37

nixos/modules/config/qt-plugin-env.nix

···

       1
       1
       +
       { config, pkgs, lib, ... }:

     

       2
       2
       +
       

     

       3
       3
       +
       {

     

       4
       4
       +
         imports = [

     

       5
       5
       +
         ];

     

       6
       6
       +
       

     

       7
       7
       +
         options = {

     

       8
       8
       +
           qtPlugins = lib.mkOption {

     

       9
       9
       +
             type = lib.types.listOf lib.types.path;

     

       10
       10
       +
             default = [];

     

       11
       11
       +
             description = ''

     

       12
       12
       +
               Plugin packages for Qt such as input methods.

     

       13
       13
       +
             '';

     

       14
       14
       +
           };

     

       15
       15
       +
         };

     

       16
       16
       +
       

     

       17
       17
       +
         config = {

     

       18
       18
       +
           environment.variables = if builtins.length config.qtPlugins > 0

     

       19
       19
       +
             then

     

       20
       20
       +
               let

     

       21
       21
       +
                 paths = [ pkgs.qt48 ] ++ config.qtPlugins;

     

       22
       22
       +
                 env = pkgs.buildEnv {

     

       23
       23
       +
                   name = "qt-plugin-env";

     

       24
       24
       +
       

     

       25
       25
       +
                   inherit paths;

     

       26
       26
       +
       

     

       27
       27
       +
                   postBuild = lib.concatStringsSep "\n"

     

       28
       28
       +
                     (map (d: d.qtPluginEnvPostBuild or "") paths);

     

       29
       29
       +
       

     

       30
       30
       +
                   ignoreCollisions = true;

     

       31
       31
       +
                 };

     

       32
       32
       +
               in {

     

       33
       33
       +
                 QT_PLUGIN_PATH = [ (builtins.toString env) ];

     

       34
       34
       +
               }

     

       35
       35
       +
             else {};

     

       36
       36
       +
         };

     

       37
       37
       +
       }

nixos/modules/module-list.nix

···

       5
       5
        
         ./config/fonts/fonts.nix

     

       6
       6
        
         ./config/fonts/ghostscript.nix

     

       7
       7
        
         ./config/gnu.nix

     

       8
       8
       +
         ./config/gtk-exe-env.nix

     

       8
       9
        
         ./config/i18n.nix

     

       9
       10
        
         ./config/krb5.nix

     

       10
       11
        
         ./config/ldap.nix

     
···

       13
       14
        
         ./config/nsswitch.nix

     

       14
       15
        
         ./config/power-management.nix

     

       15
       16
        
         ./config/pulseaudio.nix

     

       17
       17
       +
         ./config/qt-plugin-env.nix

     

       16
       18
        
         ./config/shells-environment.nix

     

       17
       19
        
         ./config/system-environment.nix

     

       18
       20
        
         ./config/swap.nix

     
···

       56
       58
        
         ./programs/shell.nix

     

       57
       59
        
         ./programs/ssh.nix

     

       58
       60
        
         ./programs/ssmtp.nix

     

       61
       61
       +
         ./programs/uim.nix

     

       59
       62
        
         ./programs/venus.nix

     

       60
       63
        
         ./programs/wvdial.nix

     

       61
       64
        
         ./programs/zsh/zsh.nix

+1 -1

nixos/modules/programs/environment.nix

···

       52
       52
        
               STRIGI_PLUGIN_PATH = [ "${i}/lib/strigi/" ];

     

       53
       53
        
               QT_PLUGIN_PATH = [ "${i}/lib/qt4/plugins" "${i}/lib/kde4/plugins" ];

     

       54
       54
        
               QTWEBKIT_PLUGIN_PATH = [ "${i}/lib/mozilla/plugins/" ];

     

       55
       55
       -
               GTK_PATH = [ "${i}/lib/gtk-2.0" ];

     

       55
       55
       +
               GTK_PATH = [ "${i}/lib/gtk-2.0" "${i}/lib/gtk-3.0" ];

     

       56
       56
        
               XDG_CONFIG_DIRS = [ "${i}/etc/xdg" ];

     

       57
       57
        
               XDG_DATA_DIRS = [ "${i}/share" ];

     

       58
       58
        
               MOZ_PLUGIN_PATH = [ "${i}/lib/mozilla/plugins" ];

+29

nixos/modules/programs/uim.nix

···

       1
       1
       +
       { config, pkgs, ... }:

     

       2
       2
       +
       

     

       3
       3
       +
       with pkgs.lib;

     

       4
       4
       +
       

     

       5
       5
       +
       let

     

       6
       6
       +
         cfg = config.uim;

     

       7
       7
       +
       in

     

       8
       8
       +
       {

     

       9
       9
       +
         options = {

     

       10
       10
       +
           uim = {

     

       11
       11
       +
             enable = mkOption {

     

       12
       12
       +
               type = types.bool;

     

       13
       13
       +
               default = false;

     

       14
       14
       +
               example = true;

     

       15
       15
       +
               description = "enable UIM input method";

     

       16
       16
       +
             };

     

       17
       17
       +
           };

     

       18
       18
       +
         };

     

       19
       19
       +
       

     

       20
       20
       +
         config = mkIf cfg.enable {

     

       21
       21
       +
           environment.systemPackages = [ pkgs.uim ];

     

       22
       22
       +
           gtkPlugins = [ pkgs.uim ];

     

       23
       23
       +
           qtPlugins = [ pkgs.uim ];

     

       24
       24
       +
           environment.variables.GTK_IM_MODULE = "uim";

     

       25
       25
       +
           environment.variables.QT_IM_MODULE = "uim";

     

       26
       26
       +
           environment.variables.XMODIFIERS = "@im=uim";

     

       27
       27
       +
           services.xserver.displayManager.sessionCommands = "uim-xim &";

     

       28
       28
       +
         };

     

       29
       29
       +
       }

pkgs/development/libraries/gtk+/2.x.nix

···

       37
       37
        
       

     

       38
       38
        
         postInstall = "rm -rf $out/share/gtk-doc";

     

       39
       39
        
       

     

       40
       40
       +
         passthru = {

     

       41
       41
       +
           gtkExeEnvPostBuild = ''

     

       42
       42
       +
             rm $out/lib/gtk-2.0/2.10.0/immodules.cache

     

       43
       43
       +
             $out/bin/gtk-query-immodules-2.0 $out/lib/gtk-2.0/2.10.0/immodules/*.so > $out/lib/gtk-2.0/2.10.0/immodules.cache

     

       44
       44
       +
           ''; # workaround for bug of nix-mode for Emacs */ '';

     

       45
       45
       +
         };

     

       46
       46
       +
       

     

       40
       47
        
         meta = with stdenv.lib; {

     

       41
       48
        
           description = "A multi-platform toolkit for creating graphical user interfaces";

     

       42
       49
        
           homepage    = http://www.gtk.org/;

pkgs/development/libraries/gtk+/3.x.nix

···

       38
       38
        
       

     

       39
       39
        
         postInstall = "rm -rf $out/share/gtk-doc";

     

       40
       40
        
       

     

       41
       41
       +
         passthru = {

     

       42
       42
       +
           gtkExeEnvPostBuild = ''

     

       43
       43
       +
             rm $out/lib/gtk-3.0/3.0.0/immodules.cache

     

       44
       44
       +
             $out/bin/gtk-query-immodules-3.0 $out/lib/gtk-3.0/3.0.0/immodules/*.so > $out/lib/gtk-3.0/3.0.0/immodules.cache

     

       45
       45
       +
           ''; # workaround for bug of nix-mode for Emacs */ '';

     

       46
       46
       +
         };

     

       47
       47
       +
       

     

       41
       48
        
         meta = {

     

       42
       49
        
           description = "A multi-platform toolkit for creating graphical user interfaces";

     

       43
       50

+44

pkgs/tools/inputmethods/uim/default.nix

···

       1
       1
       +
       {stdenv, fetchurl, intltool, pkgconfig, qt4, gtk2, gtk3, kdelibs, cmake, ... }:

     

       2
       2
       +
       

     

       3
       3
       +
       stdenv.mkDerivation rec {

     

       4
       4
       +
         version = "1.8.6";

     

       5
       5
       +
         name = "uim-${version}";

     

       6
       6
       +
       

     

       7
       7
       +
         buildInputs = [

     

       8
       8
       +
           intltool

     

       9
       9
       +
           pkgconfig

     

       10
       10
       +
           qt4

     

       11
       11
       +
           gtk2

     

       12
       12
       +
           gtk3

     

       13
       13
       +
           kdelibs

     

       14
       14
       +
           cmake

     

       15
       15
       +
         ];

     

       16
       16
       +
       

     

       17
       17
       +
         patches = [ ./immodules_cache.patch ];

     

       18
       18
       +
       

     

       19
       19
       +
         configureFlags = [

     

       20
       20
       +
           "--with-gtk2"

     

       21
       21
       +
           "--with-gtk3"

     

       22
       22
       +
           "--enable-kde4-applet"

     

       23
       23
       +
           "--enable-notify=knotify4"

     

       24
       24
       +
           "--enable-pref"

     

       25
       25
       +
           "--with-qt4"

     

       26
       26
       +
           "--with-qt4-immodule"

     

       27
       27
       +
           "--with-skk"

     

       28
       28
       +
           "--with-x"

     

       29
       29
       +
         ];

     

       30
       30
       +
       

     

       31
       31
       +
         dontUseCmakeConfigure = true;

     

       32
       32
       +
       

     

       33
       33
       +
         src = fetchurl {

     

       34
       34
       +
           url = "http://uim.googlecode.com/files/uim-${version}.tar.bz2";

     

       35
       35
       +
           sha1 = "43b9dbdead6797880e6cfc9c032ecb2d37d42777";

     

       36
       36
       +
         };

     

       37
       37
       +
       

     

       38
       38
       +
         meta = {

     

       39
       39
       +
           homepage = "http://code.google.com/p/uim/";

     

       40
       40
       +
           description = "A multilingual input method framework";

     

       41
       41
       +
           license = stdenv.lib.licenses.bsd3;

     

       42
       42
       +
           platforms = stdenv.lib.platforms.linux;

     

       43
       43
       +
         };

     

       44
       44
       +
       }

+231

pkgs/tools/inputmethods/uim/immodules_cache.patch

···

       1
       1
       +
       diff -ru -x '*~' uim-1.8.6.orig/gtk2/immodule/Makefile.am uim-1.8.6/gtk2/immodule/Makefile.am

     

       2
       2
       +
       --- uim-1.8.6.orig/gtk2/immodule/Makefile.am	2013-06-30 13:26:09.000000000 +0900

     

       3
       3
       +
       +++ uim-1.8.6/gtk2/immodule/Makefile.am	2014-07-13 21:51:26.538400004 +0900

     

       4
       4
       +
       @@ -1,5 +1,5 @@

     

       5
       5
       +
        uim_gtk_im_module_path = $(libdir)/gtk-2.0

     

       6
       6
       +
       -uim_gtk_im_module_file = $(DESTDIR)$(sysconfdir)/gtk-2.0/gtk.immodules

     

       7
       7
       +
       +uim_gtk_im_module_file = $(uim_gtk_im_module_path)/@GTK_BINARY_VERSION@/immodules.cache

     

       8
       8
       +
        

     

       9
       9
       +
        moduledir = $(uim_gtk_im_module_path)/@GTK_BINARY_VERSION@/immodules

     

       10
       10
       +
        

     

       11
       11
       +
       @@ -38,48 +38,12 @@

     

       12
       12
       +
        

     

       13
       13
       +
        install-data-hook: gtk-rc-get-immodule-file

     

       14
       14
       +
        	if test -z $(DESTDIR); then \

     

       15
       15
       +
       -	  if test $(libdir) = $(GTK_LIBDIR); then \

     

       16
       16
       +
       -	    if type $(QUERY_COMMAND) > /dev/null 2>&1; then \

     

       17
       17
       +
       -	      $(QUERY_COMMAND) > `$(GTK_RC_GET_IMMODULE_FILE)`; \

     

       18
       18
       +
       -	      echo "*** \"`$(GTK_RC_GET_IMMODULE_FILE)`\" is updated. ***";  \

     

       19
       19
       +
       -	    else \

     

       20
       20
       +
       -	      echo "********************** Warning ***********************"; \

     

       21
       21
       +
       -	      echo " $(QUERY_COMMAND) not found"; \

     

       22
       22
       +
       -	      echo " Please make sure to update"; \

     

       23
       23
       +
       -	      echo " \"`$(GTK_RC_GET_IMMODULE_FILE)`\""; \

     

       24
       24
       +
       -	      echo " manually."; \

     

       25
       25
       +
       -	      echo "******************************************************"; \

     

       26
       26
       +
       -	    fi \

     

       27
       27
       +
       -	  else \

     

       28
       28
       +
       -	    if type $(QUERY_COMMAND) > /dev/null 2>&1; then \

     

       29
       29
       +
       -	      $(mkinstalldirs) $(sysconfdir)/gtk-2.0; \

     

       30
       30
       +
       -	      GTK_PATH=$(uim_gtk_im_module_path) $(QUERY_COMMAND) > $(uim_gtk_im_module_file); \

     

       31
       31
       +
       -	      echo "******************************************************"; \

     

       32
       32
       +
       -	      echo " You need to set"; \

     

       33
       33
       +
       -	      echo " GTK_IM_MODULE_FILE=$(uim_gtk_im_module_file)"; \

     

       34
       34
       +
       -	      echo " environment variable to use this module."; \

     

       35
       35
       +
       -	      echo "******************************************************"; \

     

       36
       36
       +
       -	    else \

     

       37
       37
       +
       -	      echo "********************** Warning ***********************"; \

     

       38
       38
       +
       -	      echo " $(QUERY_COMMAND) not found"; \

     

       39
       39
       +
       -	      echo " Please make sure to update"; \

     

       40
       40
       +
       -	      echo " \"$(uim_gtk_im_module_file)\""; \

     

       41
       41
       +
       -	      echo " manually, and set"; \

     

       42
       42
       +
       -	      echo " GTK_IM_MODULE_FILE=$(uim_gtk_im_module_file)"; \

     

       43
       43
       +
       -	      echo " environment variable to use this module."; \

     

       44
       44
       +
       -	      echo "******************************************************"; \

     

       45
       45
       +
       -	    fi \

     

       46
       46
       +
       -	  fi \

     

       47
       47
       +
       +	  $(mkinstalldirs) $(uim_gtk_im_module_path)/@GTK_BINARY_VERSION@; \

     

       48
       48
       +
       +	  GTK_PATH=$(uim_gtk_im_module_path) $(QUERY_COMMAND) > $(uim_gtk_im_module_file); \

     

       49
       49
       +
        	fi

     

       50
       50
       +
        uninstall-hook:

     

       51
       51
       +
        	if test -z $(DESTDIR); then \

     

       52
       52
       +
       -	  if type $(QUERY_COMMAND) > /dev/null 2>&1; then \

     

       53
       53
       +
       -	    if test $(libdir) = $(GTK_LIBDIR); then \

     

       54
       54
       +
       -	      $(QUERY_COMMAND) > `$(GTK_RC_GET_IMMODULE_FILE)`; \

     

       55
       55
       +
       -	    else \

     

       56
       56
       +
       -	      GTK_PATH=$(uim_gtk_im_module_path) $(QUERY_COMMAND) > $(uim_gtk_im_module_file); \

     

       57
       57
       +
       -	    fi \

     

       58
       58
       +
       -	  fi \

     

       59
       59
       +
       +	  GTK_PATH=$(uim_gtk_im_module_path) $(QUERY_COMMAND) > $(uim_gtk_im_module_file); \

     

       60
       60
       +
        	fi

     

       61
       61
       +
        else

     

       62
       62
       +
        install-data-hook:

     

       63
       63
       +
       diff -ru -x '*~' uim-1.8.6.orig/gtk2/immodule/Makefile.in uim-1.8.6/gtk2/immodule/Makefile.in

     

       64
       64
       +
       --- uim-1.8.6.orig/gtk2/immodule/Makefile.in	2013-06-30 13:27:08.000000000 +0900

     

       65
       65
       +
       +++ uim-1.8.6/gtk2/immodule/Makefile.in	2014-07-13 22:12:27.947595507 +0900

     

       66
       66
       +
       @@ -434,7 +434,7 @@

     

       67
       67
       +
        top_srcdir = @top_srcdir@

     

       68
       68
       +
        uim_pixmapsdir = @uim_pixmapsdir@

     

       69
       69
       +
        uim_gtk_im_module_path = $(libdir)/gtk-2.0

     

       70
       70
       +
       -uim_gtk_im_module_file = $(DESTDIR)$(sysconfdir)/gtk-2.0/gtk.immodules

     

       71
       71
       +
       +uim_gtk_im_module_file = $(uim_gtk_im_module_path)/@GTK_BINARY_VERSION@/immodules.cache

     

       72
       72
       +
        moduledir = $(uim_gtk_im_module_path)/@GTK_BINARY_VERSION@/immodules

     

       73
       73
       +
        @GTK2_TRUE@im_uim_la = im-uim.la

     

       74
       74
       +
        @GTK2_TRUE@im_uim_la_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir)

     

       75
       75
       +
       @@ -875,48 +875,12 @@

     

       76
       76
       +
        

     

       77
       77
       +
        @GTK2_TRUE@install-data-hook: gtk-rc-get-immodule-file

     

       78
       78
       +
        @GTK2_TRUE@	if test -z $(DESTDIR); then \

     

       79
       79
       +
       -@GTK2_TRUE@	  if test $(libdir) = $(GTK_LIBDIR); then \

     

       80
       80
       +
       -@GTK2_TRUE@	    if type $(QUERY_COMMAND) > /dev/null 2>&1; then \

     

       81
       81
       +
       -@GTK2_TRUE@	      $(QUERY_COMMAND) > `$(GTK_RC_GET_IMMODULE_FILE)`; \

     

       82
       82
       +
       -@GTK2_TRUE@	      echo "*** \"`$(GTK_RC_GET_IMMODULE_FILE)`\" is updated. ***";  \

     

       83
       83
       +
       -@GTK2_TRUE@	    else \

     

       84
       84
       +
       -@GTK2_TRUE@	      echo "********************** Warning ***********************"; \

     

       85
       85
       +
       -@GTK2_TRUE@	      echo " $(QUERY_COMMAND) not found"; \

     

       86
       86
       +
       -@GTK2_TRUE@	      echo " Please make sure to update"; \

     

       87
       87
       +
       -@GTK2_TRUE@	      echo " \"`$(GTK_RC_GET_IMMODULE_FILE)`\""; \

     

       88
       88
       +
       -@GTK2_TRUE@	      echo " manually."; \

     

       89
       89
       +
       -@GTK2_TRUE@	      echo "******************************************************"; \

     

       90
       90
       +
       -@GTK2_TRUE@	    fi \

     

       91
       91
       +
       -@GTK2_TRUE@	  else \

     

       92
       92
       +
       -@GTK2_TRUE@	    if type $(QUERY_COMMAND) > /dev/null 2>&1; then \

     

       93
       93
       +
       -@GTK2_TRUE@	      $(mkinstalldirs) $(sysconfdir)/gtk-2.0; \

     

       94
       94
       +
       -@GTK2_TRUE@	      GTK_PATH=$(uim_gtk_im_module_path) $(QUERY_COMMAND) > $(uim_gtk_im_module_file); \

     

       95
       95
       +
       -@GTK2_TRUE@	      echo "******************************************************"; \

     

       96
       96
       +
       -@GTK2_TRUE@	      echo " You need to set"; \

     

       97
       97
       +
       -@GTK2_TRUE@	      echo " GTK_IM_MODULE_FILE=$(uim_gtk_im_module_file)"; \

     

       98
       98
       +
       -@GTK2_TRUE@	      echo " environment variable to use this module."; \

     

       99
       99
       +
       -@GTK2_TRUE@	      echo "******************************************************"; \

     

       100
       100
       +
       -@GTK2_TRUE@	    else \

     

       101
       101
       +
       -@GTK2_TRUE@	      echo "********************** Warning ***********************"; \

     

       102
       102
       +
       -@GTK2_TRUE@	      echo " $(QUERY_COMMAND) not found"; \

     

       103
       103
       +
       -@GTK2_TRUE@	      echo " Please make sure to update"; \

     

       104
       104
       +
       -@GTK2_TRUE@	      echo " \"$(uim_gtk_im_module_file)\""; \

     

       105
       105
       +
       -@GTK2_TRUE@	      echo " manually, and set"; \

     

       106
       106
       +
       -@GTK2_TRUE@	      echo " GTK_IM_MODULE_FILE=$(uim_gtk_im_module_file)"; \

     

       107
       107
       +
       -@GTK2_TRUE@	      echo " environment variable to use this module."; \

     

       108
       108
       +
       -@GTK2_TRUE@	      echo "******************************************************"; \

     

       109
       109
       +
       -@GTK2_TRUE@	    fi \

     

       110
       110
       +
       -@GTK2_TRUE@	  fi \

     

       111
       111
       +
       +@GTK2_TRUE@	  $(mkinstalldirs) $(uim_gtk_im_module_path)/@GTK_BINARY_VERSION@; \

     

       112
       112
       +
       +@GTK2_TRUE@	  GTK_PATH=$(uim_gtk_im_module_path) $(QUERY_COMMAND) > $(uim_gtk_im_module_file); \

     

       113
       113
       +
        @GTK2_TRUE@	fi

     

       114
       114
       +
        @GTK2_TRUE@uninstall-hook:

     

       115
       115
       +
        @GTK2_TRUE@	if test -z $(DESTDIR); then \

     

       116
       116
       +
       -@GTK2_TRUE@	  if type $(QUERY_COMMAND) > /dev/null 2>&1; then \

     

       117
       117
       +
       -@GTK2_TRUE@	    if test $(libdir) = $(GTK_LIBDIR); then \

     

       118
       118
       +
       -@GTK2_TRUE@	      $(QUERY_COMMAND) > `$(GTK_RC_GET_IMMODULE_FILE)`; \

     

       119
       119
       +
       -@GTK2_TRUE@	    else \

     

       120
       120
       +
       -@GTK2_TRUE@	      GTK_PATH=$(uim_gtk_im_module_path) $(QUERY_COMMAND) > $(uim_gtk_im_module_file); \

     

       121
       121
       +
       -@GTK2_TRUE@	    fi \

     

       122
       122
       +
       -@GTK2_TRUE@	  fi \

     

       123
       123
       +
       +@GTK2_TRUE@	  GTK_PATH=$(uim_gtk_im_module_path) $(QUERY_COMMAND) > $(uim_gtk_im_module_file); \

     

       124
       124
       +
        @GTK2_TRUE@	fi

     

       125
       125
       +
        @GTK2_FALSE@install-data-hook:

     

       126
       126
       +
        

     

       127
       127
       +
       diff -ru -x '*~' uim-1.8.6.orig/gtk3/immodule/Makefile.am uim-1.8.6/gtk3/immodule/Makefile.am

     

       128
       128
       +
       --- uim-1.8.6.orig/gtk3/immodule/Makefile.am	2013-06-30 13:26:20.000000000 +0900

     

       129
       129
       +
       +++ uim-1.8.6/gtk3/immodule/Makefile.am	2014-07-13 21:55:38.114246503 +0900

     

       130
       130
       +
       @@ -45,42 +45,11 @@

     

       131
       131
       +
        

     

       132
       132
       +
        install-data-hook: gtk3-rc-get-immodule-file

     

       133
       133
       +
        	if test -z $(DESTDIR); then \

     

       134
       134
       +
       -	  if test $(libdir) = $(GTK3_LIBDIR); then \

     

       135
       135
       +
       -	    if type $(QUERY_COMMAND) > /dev/null 2>&1; then \

     

       136
       136
       +
       -	      $(QUERY_COMMAND) --update-cache; \

     

       137
       137
       +
       -	      echo "*** \"`$(GTK3_RC_GET_IMMODULE_FILE)`\" is updated. ***";  \

     

       138
       138
       +
       -	    else \

     

       139
       139
       +
       -	      echo "********************** Warning ***********************"; \

     

       140
       140
       +
       -	      echo " $(QUERY_COMMAND) not found"; \

     

       141
       141
       +
       -	      echo " Please make sure to update"; \

     

       142
       142
       +
       -	      echo " \"`$(GTK3_RC_GET_IMMODULE_FILE)`\""; \

     

       143
       143
       +
       -	      echo " manually."; \

     

       144
       144
       +
       -	      echo "******************************************************"; \

     

       145
       145
       +
       -	    fi \

     

       146
       146
       +
       -	  else \

     

       147
       147
       +
       -	    if type $(QUERY_COMMAND) > /dev/null 2>&1; then \

     

       148
       148
       +
       -	      GTK_PATH=$(uim_gtk3_im_module_path) $(QUERY_COMMAND) --update-cache; \

     

       149
       149
       +
       -	    else \

     

       150
       150
       +
       -	      echo "********************** Warning ***********************"; \

     

       151
       151
       +
       -	      echo " $(QUERY_COMMAND) not found"; \

     

       152
       152
       +
       -	      echo " Please make sure to update"; \

     

       153
       153
       +
       -	      echo " immodules.cache"; \

     

       154
       154
       +
       -	      echo " manually, and set"; \

     

       155
       155
       +
       -	      echo " GTK_IM_MODULE_FILE=PATH_TO/immodule.cache"; \

     

       156
       156
       +
       -	      echo " environment variable to use this module."; \

     

       157
       157
       +
       -	      echo "******************************************************"; \

     

       158
       158
       +
       -	    fi \

     

       159
       159
       +
       -	  fi \

     

       160
       160
       +
       +	  GTK_PATH=$(uim_gtk3_im_module_path) $(QUERY_COMMAND) > $(uim_gtk3_im_module_path)/@GTK3_BINARY_VERSION@/immodules.cache ; \

     

       161
       161
       +
        	fi

     

       162
       162
       +
        uninstall-hook:

     

       163
       163
       +
        	if test -z $(DESTDIR); then \

     

       164
       164
       +
       -	  if type $(QUERY_COMMAND) > /dev/null 2>&1; then \

     

       165
       165
       +
       -	    if test $(libdir) = $(GTK3_LIBDIR); then \

     

       166
       166
       +
       -	      $(QUERY_COMMAND) --update-cache; \

     

       167
       167
       +
       -	    else \

     

       168
       168
       +
       -	      GTK_PATH=$(uim_gtk3_im_module_path) $(QUERY_COMMAND) --update-cache; \

     

       169
       169
       +
       -	    fi \

     

       170
       170
       +
       -	  fi \

     

       171
       171
       +
       +	  GTK_PATH=$(uim_gtk3_im_module_path) $(QUERY_COMMAND) > $(uim_gtk3_im_module_path)/@GTK3_BINARY_VERSION@/immodules.cache ; \

     

       172
       172
       +
        	fi

     

       173
       173
       +
        else

     

       174
       174
       +
        install-data-hook:

     

       175
       175
       +
       diff -ru -x '*~' uim-1.8.6.orig/gtk3/immodule/Makefile.in uim-1.8.6/gtk3/immodule/Makefile.in

     

       176
       176
       +
       --- uim-1.8.6.orig/gtk3/immodule/Makefile.in	2013-06-30 13:27:08.000000000 +0900

     

       177
       177
       +
       +++ uim-1.8.6/gtk3/immodule/Makefile.in	2014-07-13 21:56:11.531225832 +0900

     

       178
       178
       +
       @@ -893,42 +893,11 @@

     

       179
       179
       +
        

     

       180
       180
       +
        @GTK3_TRUE@install-data-hook: gtk3-rc-get-immodule-file

     

       181
       181
       +
        @GTK3_TRUE@	if test -z $(DESTDIR); then \

     

       182
       182
       +
       -@GTK3_TRUE@	  if test $(libdir) = $(GTK3_LIBDIR); then \

     

       183
       183
       +
       -@GTK3_TRUE@	    if type $(QUERY_COMMAND) > /dev/null 2>&1; then \

     

       184
       184
       +
       -@GTK3_TRUE@	      $(QUERY_COMMAND) --update-cache; \

     

       185
       185
       +
       -@GTK3_TRUE@	      echo "*** \"`$(GTK3_RC_GET_IMMODULE_FILE)`\" is updated. ***";  \

     

       186
       186
       +
       -@GTK3_TRUE@	    else \

     

       187
       187
       +
       -@GTK3_TRUE@	      echo "********************** Warning ***********************"; \

     

       188
       188
       +
       -@GTK3_TRUE@	      echo " $(QUERY_COMMAND) not found"; \

     

       189
       189
       +
       -@GTK3_TRUE@	      echo " Please make sure to update"; \

     

       190
       190
       +
       -@GTK3_TRUE@	      echo " \"`$(GTK3_RC_GET_IMMODULE_FILE)`\""; \

     

       191
       191
       +
       -@GTK3_TRUE@	      echo " manually."; \

     

       192
       192
       +
       -@GTK3_TRUE@	      echo "******************************************************"; \

     

       193
       193
       +
       -@GTK3_TRUE@	    fi \

     

       194
       194
       +
       -@GTK3_TRUE@	  else \

     

       195
       195
       +
       -@GTK3_TRUE@	    if type $(QUERY_COMMAND) > /dev/null 2>&1; then \

     

       196
       196
       +
       -@GTK3_TRUE@	      GTK_PATH=$(uim_gtk3_im_module_path) $(QUERY_COMMAND) --update-cache; \

     

       197
       197
       +
       -@GTK3_TRUE@	    else \

     

       198
       198
       +
       -@GTK3_TRUE@	      echo "********************** Warning ***********************"; \

     

       199
       199
       +
       -@GTK3_TRUE@	      echo " $(QUERY_COMMAND) not found"; \

     

       200
       200
       +
       -@GTK3_TRUE@	      echo " Please make sure to update"; \

     

       201
       201
       +
       -@GTK3_TRUE@	      echo " immodules.cache"; \

     

       202
       202
       +
       -@GTK3_TRUE@	      echo " manually, and set"; \

     

       203
       203
       +
       -@GTK3_TRUE@	      echo " GTK_IM_MODULE_FILE=PATH_TO/immodule.cache"; \

     

       204
       204
       +
       -@GTK3_TRUE@	      echo " environment variable to use this module."; \

     

       205
       205
       +
       -@GTK3_TRUE@	      echo "******************************************************"; \

     

       206
       206
       +
       -@GTK3_TRUE@	    fi \

     

       207
       207
       +
       -@GTK3_TRUE@	  fi \

     

       208
       208
       +
       +@GTK3_TRUE@	  GTK_PATH=$(uim_gtk3_im_module_path) $(QUERY_COMMAND) > $(uim_gtk3_im_module_path)/@GTK3_BINARY_VERSION@/immodules.cache ; \

     

       209
       209
       +
        @GTK3_TRUE@	fi

     

       210
       210
       +
        @GTK3_TRUE@uninstall-hook:

     

       211
       211
       +
        @GTK3_TRUE@	if test -z $(DESTDIR); then \

     

       212
       212
       +
       -@GTK3_TRUE@	  if type $(QUERY_COMMAND) > /dev/null 2>&1; then \

     

       213
       213
       +
       -@GTK3_TRUE@	    if test $(libdir) = $(GTK3_LIBDIR); then \

     

       214
       214
       +
       -@GTK3_TRUE@	      $(QUERY_COMMAND) --update-cache; \

     

       215
       215
       +
       -@GTK3_TRUE@	    else \

     

       216
       216
       +
       -@GTK3_TRUE@	      GTK_PATH=$(uim_gtk3_im_module_path) $(QUERY_COMMAND) --update-cache; \

     

       217
       217
       +
       -@GTK3_TRUE@	    fi \

     

       218
       218
       +
       -@GTK3_TRUE@	  fi \

     

       219
       219
       +
       +@GTK3_TRUE@	  GTK_PATH=$(uim_gtk3_im_module_path) $(QUERY_COMMAND) > $(uim_gtk3_im_module_path)/@GTK3_BINARY_VERSION@/immodules.cache ; \

     

       220
       220
       +
        @GTK3_TRUE@	fi

     

       221
       221
       +
        @GTK3_FALSE@install-data-hook:

     

       222
       222
       +
        

     

       223
       223
       +
       diff -ru -x '*~' uim-1.8.6.orig/qt4/immodule/quiminputcontextplugin.pro.in uim-1.8.6/qt4/immodule/quiminputcontextplugin.pro.in

     

       224
       224
       +
       --- uim-1.8.6.orig/qt4/immodule/quiminputcontextplugin.pro.in	2013-06-30 13:26:20.000000000 +0900

     

       225
       225
       +
       +++ uim-1.8.6/qt4/immodule/quiminputcontextplugin.pro.in	2014-03-09 11:31:19.388085048 +0900

     

       226
       226
       +
       @@ -35,4 +35,4 @@

     

       227
       227
       +
        

     

       228
       228
       +
        TARGET = uiminputcontextplugin

     

       229
       229
       +
        

     

       230
       230
       +
       -target.path += @DESTDIR@$$[QT_INSTALL_PLUGINS]/inputmethods

     

       231
       231
       +
       +target.path += @DESTDIR@@exec_prefix@/lib/qt4/plugins/inputmethods

pkgs/top-level/all-packages.nix

···

       2325
       2325
        
       

     

       2326
       2326
        
         ttmkfdir = callPackage ../tools/misc/ttmkfdir { };

     

       2327
       2327
        
       

     

       2328
       2328
       +
         uim = callPackage ../tools/inputmethods/uim {

     

       2329
       2329
       +
           inherit (pkgs.kde4) kdelibs;

     

       2330
       2330
       +
         };

     

       2331
       2331
       +
       

     

       2328
       2332
        
         unclutter = callPackage ../tools/misc/unclutter { };

     

       2329
       2333
        
       

     

       2330
       2334
        
         unbound = callPackage ../tools/networking/unbound { };