From 9b61ff349a355e7f63cfe90d6d86551ec0d76765 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Tue, 11 Oct 2022 08:31:04 +0200 Subject: [PATCH 1/2] gtk4: fix build on aarch64-darwin --- pkgs/development/libraries/gtk/4.x.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/gtk/4.x.nix b/pkgs/development/libraries/gtk/4.x.nix index 64e7a745e954..7a6c7813224b 100644 --- a/pkgs/development/libraries/gtk/4.x.nix +++ b/pkgs/development/libraries/gtk/4.x.nix @@ -93,6 +93,7 @@ stdenv.mkDerivation rec { sassc gi-docgen libxml2 # for xmllint + ] ++ lib.optionals waylandSupport [ wayland-scanner ] ++ setupHooks; From 24addef4aee96fd7dad5f869bb375ff6614196b4 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Tue, 11 Oct 2022 08:33:29 +0200 Subject: [PATCH 2/2] qrencode: fix build on x86_64-darwin --- pkgs/development/libraries/qrencode/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/qrencode/default.nix b/pkgs/development/libraries/qrencode/default.nix index abab060bf2cd..57ccfd382f7b 100644 --- a/pkgs/development/libraries/qrencode/default.nix +++ b/pkgs/development/libraries/qrencode/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, SDL2, libpng, libiconv }: +{ lib, stdenv, fetchurl, pkg-config, SDL2, libpng, libiconv, libobjc }: stdenv.mkDerivation rec { pname = "qrencode"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ SDL2 libpng ] ++ lib.optionals stdenv.isDarwin [ libiconv ]; + buildInputs = [ SDL2 libpng ] ++ lib.optionals stdenv.isDarwin [ libiconv libobjc ]; configureFlags = [ "--with-tests" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b51c0bbbe3d0..24be09c8be7e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28569,7 +28569,9 @@ with pkgs; qrcodegen = callPackage ../development/libraries/qrcodegen { }; - qrencode = callPackage ../development/libraries/qrencode { }; + qrencode = callPackage ../development/libraries/qrencode { + inherit (darwin) libobjc; + }; geeqie = callPackage ../applications/graphics/geeqie { };