diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-05-15 00:02:08 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-05-15 00:02:08 +0000 |
commit | 935cdc9f966633196febf18c6108b8adde666fa6 (patch) | |
tree | 65f4cde7e3646af5e780f9254602a8e02a953e9b /pkgs/os-specific/darwin | |
parent | a47743431bb52c25eecbeda1bb2350902478befe (diff) | |
parent | 311cd0a3d88abaafdd5b5218efd6affea48fba7e (diff) |
Merge master into staging-next
Diffstat (limited to 'pkgs/os-specific/darwin')
-rw-r--r-- | pkgs/os-specific/darwin/openwith/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/os-specific/darwin/openwith/default.nix b/pkgs/os-specific/darwin/openwith/default.nix index eb78f7a1344c4..d28ed4942821c 100644 --- a/pkgs/os-specific/darwin/openwith/default.nix +++ b/pkgs/os-specific/darwin/openwith/default.nix @@ -1,6 +1,7 @@ -{ lib, stdenv, fetchFromGitHub, swift, AppKit, Foundation, UniformTypeIdentifiers }: +{ lib, swiftPackages, fetchFromGitHub }: let + inherit (swiftPackages) apple_sdk stdenv swift; arch = if stdenv.isAarch64 then "arm64" else "x86_64"; in stdenv.mkDerivation rec { @@ -16,7 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ swift ]; - buildInputs = [ AppKit Foundation UniformTypeIdentifiers ]; + buildInputs = with apple_sdk.frameworks; [ AppKit Foundation UniformTypeIdentifiers ]; makeFlags = [ "openwith_${arch}" ]; @@ -32,6 +33,5 @@ stdenv.mkDerivation rec { license = licenses.unlicense; maintainers = with maintainers; [ zowoq ]; platforms = [ "aarch64-darwin" "x86_64-darwin" ]; - broken = stdenv.isx86_64; # https://hydra.nixos.org/build/219354133/nixlog/3 }; } |