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

nixos/i18n/input-method: Fix cross

Browse Source 
If the gtk2 and gtk3 are moved to `nativeBuildInputs` then this happens

```
Cannot load module /nix/store/sn268l2xkdvkvagq1r35xy9071zns4hx-ibus-with-plugins-1.5.32/lib/gtk-3.0/3.0.0/immodules/im-ibus.so: /nix/store/sn268l2xkdvkvagq1r35xy9071zns4hx-ibus-with-plugins-1.5.32/lib/gtk-3.0/3.0.0/immodules/im-ibus.so: cannot open shared object file: No such file or directory
> /nix/store/sn268l2xkdvkvagq1r35xy9071zns4hx-ibus-with-plugins-1.5.32/lib/gtk-3.0/3.0.0/immodules/im-ibus.so does not export GTK+ IM module API: /nix/store/sn268l2xkdvkvagq1r35xy9071zns4hx-ibus-with-plugins-1.5.32/lib/gtk-3.0/3.0.0/immodules/im-ibus.so: cannot open shared object file: No such file or directory
```
This commit is contained in:
Artturin
2025-08-19 17:20:12 +03:00
parent 68693c4c6a
commit 2855529114
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
nixos/modules/i18n/input-method/default.nix
View File

@@ -22,13 +22,12 @@ let
preferLocalBuild = true; preferLocalBuild = true;
allowSubstitutes = false; allowSubstitutes = false;
buildInputs = [ buildInputs = [
pkgs.gtk2
cfg.package cfg.package
]; ];
} }
'' ''
mkdir -p $out/etc/gtk-2.0/ mkdir -p $out/etc/gtk-2.0/
GTK_PATH=${cfg.package}/lib/gtk-2.0/ gtk-query-immodules-2.0 > $out/etc/gtk-2.0/immodules.cache GTK_PATH=${cfg.package}/lib/gtk-2.0/ ${pkgs.stdenv.hostPlatform.emulator pkgs.buildPackages} ${lib.getExe' pkgs.gtk2.dev "gtk-query-immodules-2.0"} > $out/etc/gtk-2.0/immodules.cache
''; '';
gtk3_cache = gtk3_cache =
@@ -37,13 +36,12 @@ let
preferLocalBuild = true; preferLocalBuild = true;
allowSubstitutes = false; allowSubstitutes = false;
buildInputs = [ buildInputs = [
pkgs.gtk3
cfg.package cfg.package
]; ];
} }
'' ''
mkdir -p $out/etc/gtk-3.0/ mkdir -p $out/etc/gtk-3.0/
GTK_PATH=${cfg.package}/lib/gtk-3.0/ gtk-query-immodules-3.0 > $out/etc/gtk-3.0/immodules.cache GTK_PATH=${cfg.package}/lib/gtk-3.0/ ${pkgs.stdenv.hostPlatform.emulator pkgs.buildPackages} ${lib.getExe' pkgs.gtk3.dev "gtk-query-immodules-3.0"} > $out/etc/gtk-3.0/immodules.cache
''; '';
in in
@@ -107,8 +105,12 @@ in
environment.systemPackages = [ environment.systemPackages = [
cfg.package cfg.package
] ]
++ lib.optional cfg.enableGtk2 gtk2_cache ++ lib.optional (
++ lib.optional cfg.enableGtk3 gtk3_cache; cfg.enableGtk2 && (pkgs.stdenv.hostPlatform.emulatorAvailable pkgs.buildPackages)
) gtk2_cache
++ lib.optional (
cfg.enableGtk3 && (pkgs.stdenv.hostPlatform.emulatorAvailable pkgs.buildPackages)
) gtk3_cache;
}; };
meta = { meta = {