Merge pull request #132239 from Artturin/keybinder3-darwin

This commit is contained in:
Artturi
2021-11-03 13:44:37 +02:00
committed by GitHub
3 changed files with 8 additions and 1 deletions
+6
View File
@@ -148,6 +148,8 @@ stdenv.mkDerivation rec {
"-Dtests=false"
"-Dtracker3=${lib.boolToString trackerSupport}"
"-Dbroadway_backend=${lib.boolToString broadwaySupport}"
"-Dx11_backend=${lib.boolToString x11Support}"
"-Dquartz_backend=${lib.boolToString (stdenv.isDarwin && !x11Support)}"
];
doCheck = false; # needs X11
@@ -159,6 +161,10 @@ stdenv.mkDerivation rec {
NIX_CFLAGS_COMPILE = "-DG_ENABLE_DEBUG -DG_DISABLE_CAST_CHECKS";
postPatch = ''
# See https://github.com/NixOS/nixpkgs/issues/132259
substituteInPlace meson.build \
--replace "x11_enabled = false" ""
files=(
build-aux/meson/post-install.py
demos/gtk-demo/geninclude.py
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
description = "Library for registering global key bindings";
homepage = "https://github.com/kupferlauncher/keybinder/";
license = licenses.mit;
platforms = platforms.linux;
platforms = platforms.unix;
maintainers = [ maintainers.cstrahan ];
};
}
+1
View File
@@ -17011,6 +17011,7 @@ with pkgs;
};
keybinder3 = callPackage ../development/libraries/keybinder3 {
gtk3 = if stdenv.isDarwin then gtk3-x11 else gtk3;
automake = automake111x;
};