Merge pull request #195435 from wegank/gtk4-darwin

gtk4: fix build on darwin

authored by Jan Tojnar and committed by GitHub ee9aa033 723a0b42

+6 -3
+1
pkgs/development/libraries/gtk/4.x.nix
··· 93 sassc 94 gi-docgen 95 libxml2 # for xmllint 96 wayland-scanner 97 ] ++ setupHooks; 98
··· 93 sassc 94 gi-docgen 95 libxml2 # for xmllint 96 + ] ++ lib.optionals waylandSupport [ 97 wayland-scanner 98 ] ++ setupHooks; 99
+2 -2
pkgs/development/libraries/qrencode/default.nix
··· 1 - { lib, stdenv, fetchurl, pkg-config, SDL2, libpng, libiconv }: 2 3 stdenv.mkDerivation rec { 4 pname = "qrencode"; ··· 12 }; 13 14 nativeBuildInputs = [ pkg-config ]; 15 - buildInputs = [ SDL2 libpng ] ++ lib.optionals stdenv.isDarwin [ libiconv ]; 16 17 configureFlags = [ 18 "--with-tests"
··· 1 + { lib, stdenv, fetchurl, pkg-config, SDL2, libpng, libiconv, libobjc }: 2 3 stdenv.mkDerivation rec { 4 pname = "qrencode"; ··· 12 }; 13 14 nativeBuildInputs = [ pkg-config ]; 15 + buildInputs = [ SDL2 libpng ] ++ lib.optionals stdenv.isDarwin [ libiconv libobjc ]; 16 17 configureFlags = [ 18 "--with-tests"
+3 -1
pkgs/top-level/all-packages.nix
··· 28613 28614 qrcodegen = callPackage ../development/libraries/qrcodegen { }; 28615 28616 - qrencode = callPackage ../development/libraries/qrencode { }; 28617 28618 geeqie = callPackage ../applications/graphics/geeqie { }; 28619
··· 28613 28614 qrcodegen = callPackage ../development/libraries/qrcodegen { }; 28615 28616 + qrencode = callPackage ../development/libraries/qrencode { 28617 + inherit (darwin) libobjc; 28618 + }; 28619 28620 geeqie = callPackage ../applications/graphics/geeqie { }; 28621