Merge pull request #132239 from Artturin/keybinder3-darwin

authored by Artturi and committed by GitHub c19a058e 65dd3018

+8 -1
+6
pkgs/development/libraries/gtk/3.x.nix
··· 148 "-Dtests=false" 149 "-Dtracker3=${lib.boolToString trackerSupport}" 150 "-Dbroadway_backend=${lib.boolToString broadwaySupport}" 151 ]; 152 153 doCheck = false; # needs X11 ··· 159 NIX_CFLAGS_COMPILE = "-DG_ENABLE_DEBUG -DG_DISABLE_CAST_CHECKS"; 160 161 postPatch = '' 162 files=( 163 build-aux/meson/post-install.py 164 demos/gtk-demo/geninclude.py
··· 148 "-Dtests=false" 149 "-Dtracker3=${lib.boolToString trackerSupport}" 150 "-Dbroadway_backend=${lib.boolToString broadwaySupport}" 151 + "-Dx11_backend=${lib.boolToString x11Support}" 152 + "-Dquartz_backend=${lib.boolToString (stdenv.isDarwin && !x11Support)}" 153 ]; 154 155 doCheck = false; # needs X11 ··· 161 NIX_CFLAGS_COMPILE = "-DG_ENABLE_DEBUG -DG_DISABLE_CAST_CHECKS"; 162 163 postPatch = '' 164 + # See https://github.com/NixOS/nixpkgs/issues/132259 165 + substituteInPlace meson.build \ 166 + --replace "x11_enabled = false" "" 167 + 168 files=( 169 build-aux/meson/post-install.py 170 demos/gtk-demo/geninclude.py
+1 -1
pkgs/development/libraries/keybinder3/default.nix
··· 27 description = "Library for registering global key bindings"; 28 homepage = "https://github.com/kupferlauncher/keybinder/"; 29 license = licenses.mit; 30 - platforms = platforms.linux; 31 maintainers = [ maintainers.cstrahan ]; 32 }; 33 }
··· 27 description = "Library for registering global key bindings"; 28 homepage = "https://github.com/kupferlauncher/keybinder/"; 29 license = licenses.mit; 30 + platforms = platforms.unix; 31 maintainers = [ maintainers.cstrahan ]; 32 }; 33 }
+1
pkgs/top-level/all-packages.nix
··· 17011 }; 17012 17013 keybinder3 = callPackage ../development/libraries/keybinder3 { 17014 automake = automake111x; 17015 }; 17016
··· 17011 }; 17012 17013 keybinder3 = callPackage ../development/libraries/keybinder3 { 17014 + gtk3 = if stdenv.isDarwin then gtk3-x11 else gtk3; 17015 automake = automake111x; 17016 }; 17017