From 84f58338db389dfa85bd8d8236ad48d8124aa260 Mon Sep 17 00:00:00 2001 From: Artturin Date: Mon, 1 Nov 2021 14:59:44 +0200 Subject: [PATCH 1/2] gtk3: restore x11 support on darwin --- pkgs/development/libraries/gtk/3.x.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/libraries/gtk/3.x.nix b/pkgs/development/libraries/gtk/3.x.nix index 499615a79c1c..6fce8ca78e81 100644 --- a/pkgs/development/libraries/gtk/3.x.nix +++ b/pkgs/development/libraries/gtk/3.x.nix @@ -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 From 0a10f96f8abd0518718b4665d0d33b7143e7fb26 Mon Sep 17 00:00:00 2001 From: Artturin Date: Sat, 31 Jul 2021 22:00:34 +0300 Subject: [PATCH 2/2] keybinder3: use gtk-x11 on darwin --- pkgs/development/libraries/keybinder3/default.nix | 2 +- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/keybinder3/default.nix b/pkgs/development/libraries/keybinder3/default.nix index 78755a87919d..94f10426c715 100644 --- a/pkgs/development/libraries/keybinder3/default.nix +++ b/pkgs/development/libraries/keybinder3/default.nix @@ -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 ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 62e580034d89..f2651476465c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17002,6 +17002,7 @@ with pkgs; }; keybinder3 = callPackage ../development/libraries/keybinder3 { + gtk3 = if stdenv.isDarwin then gtk3-x11 else gtk3; automake = automake111x; };