From 6b396c292ce7b8195eda5adf18a04ff3ce0c7b55 Mon Sep 17 00:00:00 2001 From: "Travis A. Everett" Date: Thu, 8 Dec 2022 20:51:40 -0600 Subject: [PATCH 1/3] gnome.zenity: relax meta.platforms --- pkgs/desktops/gnome/core/zenity/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/gnome/core/zenity/default.nix b/pkgs/desktops/gnome/core/zenity/default.nix index cd6a9c59c74..1bb1f4384b5 100644 --- a/pkgs/desktops/gnome/core/zenity/default.nix +++ b/pkgs/desktops/gnome/core/zenity/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Tool to display dialogs from the commandline and shell scripts"; homepage = "https://wiki.gnome.org/Projects/Zenity"; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = teams.gnome.members; }; } From b5b79d6a424382ecc4d3b576fc961d0bb30dd02d Mon Sep 17 00:00:00 2001 From: "Travis A. Everett" Date: Thu, 8 Dec 2022 23:12:18 -0600 Subject: [PATCH 2/3] tev: mark broken on darwin --- pkgs/applications/graphics/tev/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/graphics/tev/default.nix b/pkgs/applications/graphics/tev/default.nix index 7a5dde82f16..e32226ad2f9 100644 --- a/pkgs/applications/graphics/tev/default.nix +++ b/pkgs/applications/graphics/tev/default.nix @@ -49,6 +49,7 @@ stdenv.mkDerivation rec { license = licenses.bsd3; platforms = platforms.unix; badPlatforms = [ "aarch64-linux" ]; # fails on Hydra since forever + broken = stdenv.isDarwin; # needs apple frameworks + SDK fix? see #205247 maintainers = with maintainers; [ ]; }; } From 2aedc956a6b59551725ac3f3cc8aa36e592cd85e Mon Sep 17 00:00:00 2001 From: "Travis A. Everett" Date: Thu, 8 Dec 2022 23:23:56 -0600 Subject: [PATCH 3/3] luaPackages.nfd: fix build on darwin --- pkgs/development/lua-modules/nfd/default.nix | 6 ++++-- pkgs/top-level/lua-packages.nix | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/lua-modules/nfd/default.nix b/pkgs/development/lua-modules/nfd/default.nix index ab6e1b83d79..148b074666e 100644 --- a/pkgs/development/lua-modules/nfd/default.nix +++ b/pkgs/development/lua-modules/nfd/default.nix @@ -1,5 +1,5 @@ -{ fetchFromGitHub, buildLuarocksPackage, lua, pkg-config, lib -, substituteAll, zenity }: +{ stdenv, fetchFromGitHub, buildLuarocksPackage, lua, pkg-config, lib +, substituteAll, zenity, AppKit }: buildLuarocksPackage { pname = "nfd"; @@ -25,6 +25,8 @@ buildLuarocksPackage { extraVariables.LUA_LIBDIR = "${lua}/lib"; nativeBuildInputs = [ pkg-config ]; + buildInputs = lib.optionals stdenv.isDarwin [ AppKit ]; + fixupPhase = '' find $out -name nfd_zenity.so -execdir mv {} nfd.so \; ''; diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index 3617e763233..261f92c498c 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -95,6 +95,7 @@ in nfd = callPackage ../development/lua-modules/nfd { inherit (pkgs.gnome) zenity; + inherit (pkgs.darwin.apple_sdk.frameworks) AppKit; }; vicious = (callPackage ({ fetchFromGitHub }: stdenv.mkDerivation rec {