JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

darwin.openwith: unbreak on x86_64-darwin

Browse Source
This commit is contained in:
zowoq 2024-05-14 13:35:59 +10:00
parent d1414f543e
commit e5d9b197e9
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/os-specific/darwin/openwith/default.nix
View File

@ -1,6 +1,7 @@
{ lib, stdenv, fetchFromGitHub, swift, AppKit, Foundation, UniformTypeIdentifiers }: { lib, swiftPackages, fetchFromGitHub }:
let let
inherit (swiftPackages) apple_sdk stdenv swift;
arch = if stdenv.isAarch64 then "arm64" else "x86_64"; arch = if stdenv.isAarch64 then "arm64" else "x86_64";
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -16,7 +17,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ swift ]; nativeBuildInputs = [ swift ];
buildInputs = [ AppKit Foundation UniformTypeIdentifiers ]; buildInputs = with apple_sdk.frameworks; [ AppKit Foundation UniformTypeIdentifiers ];
makeFlags = [ "openwith_${arch}" ]; makeFlags = [ "openwith_${arch}" ];
@ -32,6 +33,5 @@ stdenv.mkDerivation rec {
license = licenses.unlicense; license = licenses.unlicense;
maintainers = with maintainers; [ zowoq ]; maintainers = with maintainers; [ zowoq ];
platforms = [ "aarch64-darwin" "x86_64-darwin" ]; platforms = [ "aarch64-darwin" "x86_64-darwin" ];
broken = stdenv.isx86_64; # https://hydra.nixos.org/build/219354133/nixlog/3
}; };
} }

4
pkgs/top-level/darwin-packages.nix
View File

@ -172,9 +172,7 @@ impure-cmds // appleSourcePackages // chooseLibs // {
inherit (apple_sdk_11_0.libs) simd; inherit (apple_sdk_11_0.libs) simd;
}; };
openwith = pkgs.darwin.apple_sdk_11_0.callPackage ../os-specific/darwin/openwith { openwith = callPackage ../os-specific/darwin/openwith { };
inherit (apple_sdk_11_0.frameworks) AppKit Foundation UniformTypeIdentifiers;
};
stubs = pkgs.callPackages ../os-specific/darwin/stubs { }; stubs = pkgs.callPackages ../os-specific/darwin/stubs { };