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

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot]
2021-02-11 18:16:48 +00:00
committed by GitHub
parent 1af73c223c bde46aca9e
commit 402b752521
35 changed files with 200 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix
View File

@@ -7,6 +7,7 @@
, gobject-introspection
, gtk2
, gtk3
, gtk4
, pcre
, libuuid
, libselinux
@@ -36,12 +37,11 @@ stdenv.mkDerivation rec {
cmakeFlags = [
"-DGOBJECT_INTROSPECTION_GIRDIR=share/gir-1.0"
"-DGOBJECT_INTROSPECTION_TYPELIBDIR=lib/girepository-1.0"
# disabled since we currently don't have gtk4 in nixpkgs
"-DENABLE_GTK4_IM_MODULE=off"
] ++ lib.optional (! withGTK2) "-DENABLE_GTK2_IM_MODULE=off";
buildInputs = [
gtk3
gtk4
gobject-introspection
fcitx5
pcre