From 5d5350c85e965d5a1794fc0aab7f2ceb1fd47f34 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Tue, 2 Aug 2022 21:41:33 +0200 Subject: [PATCH] libadwaita: add darwin support --- .../libraries/libadwaita/default.nix | 18 +++++++++++++++--- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/libadwaita/default.nix b/pkgs/development/libraries/libadwaita/default.nix index ef2daeb7074..54bf2060156 100644 --- a/pkgs/development/libraries/libadwaita/default.nix +++ b/pkgs/development/libraries/libadwaita/default.nix @@ -17,6 +17,8 @@ , gnome , gsettings-desktop-schemas , xvfb-run +, AppKit +, Foundation }: stdenv.mkDerivation rec { @@ -48,11 +50,16 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dgtk_doc=true" + ] ++ lib.optionals (!doCheck) [ + "-Dtests=false" ]; buildInputs = [ fribidi gobject-introspection + ] ++ lib.optionals stdenv.isDarwin [ + AppKit + Foundation ]; propagatedBuildInputs = [ @@ -61,10 +68,15 @@ stdenv.mkDerivation rec { checkInputs = [ gnome.adwaita-icon-theme + ] ++ lib.optionals (!stdenv.isDarwin) [ xvfb-run ]; - doCheck = true; + # Tests had to be disabled on Darwin because they fail with the same error as https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=264947 on Hydra: + # + # In file included from ../tests/test-style-manager.c:10: + # ../src/adw-settings-private.h:16:10: fatal error: 'adw-enums-private.h' file not found + doCheck = !stdenv.isDarwin; checkPhase = '' runHook preCheck @@ -81,7 +93,7 @@ stdenv.mkDerivation rec { # Tests need a cache directory "HOME=$TMPDIR" ) - env "''${testEnvironment[@]}" xvfb-run \ + env "''${testEnvironment[@]}" ${lib.optionalString (!stdenv.isDarwin) "xvfb-run"} \ meson test --print-errorlogs runHook postCheck @@ -102,6 +114,6 @@ stdenv.mkDerivation rec { homepage = "https://gitlab.gnome.org/GNOME/libadwaita"; license = licenses.lgpl21Plus; maintainers = teams.gnome.members ++ (with maintainers; [ dotlambda ]); - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index de50a74f5ce..f9a8b9d9df7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18651,7 +18651,9 @@ with pkgs; libad9361 = callPackage ../development/libraries/libad9361 { }; - libadwaita = callPackage ../development/libraries/libadwaita { }; + libadwaita = callPackage ../development/libraries/libadwaita { + inherit (pkgs.darwin.apple_sdk.frameworks) AppKit Foundation; + }; libaec = callPackage ../development/libraries/libaec { };