b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #195435 from wegank/gtk4-darwin

Browse source 
gtk4: fix build on darwin
This commit is contained in:
Jan Tojnar 2022-10-11 20:36:53 +02:00 committed by GitHub
parent 723a0b42d7 24addef4ae
commit ee9aa033c5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
pkgs/development/libraries/gtk/4.x.nix
View file

@ -93,6 +93,7 @@ stdenv.mkDerivation rec {
sassc
gi-docgen
libxml2 # for xmllint
] ++ lib.optionals waylandSupport [
wayland-scanner
] ++ setupHooks;

4
pkgs/development/libraries/qrencode/default.nix
View file

@ -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"

4
pkgs/top-level/all-packages.nix
View file

@ -28613,7 +28613,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 { };