pyrox.dev
lol
darwin.openwith: unbreak on x86_64-darwin
+4
-6
+3
-3
pkgs/os-specific/darwin/openwith/default.nix
+3
-3
pkgs/os-specific/darwin/openwith/default.nix
···
1
-
{ lib, stdenv, fetchFromGitHub, swift, AppKit, Foundation, UniformTypeIdentifiers }:
1
+
{ lib, swiftPackages, fetchFromGitHub }:
2
2
3
3
let
4
+
inherit (swiftPackages) apple_sdk stdenv swift;
4
5
arch = if stdenv.isAarch64 then "arm64" else "x86_64";
5
6
in
6
7
stdenv.mkDerivation rec {
···
16
17
17
18
nativeBuildInputs = [ swift ];
18
19
19
-
buildInputs = [ AppKit Foundation UniformTypeIdentifiers ];
20
+
buildInputs = with apple_sdk.frameworks; [ AppKit Foundation UniformTypeIdentifiers ];
20
21
21
22
makeFlags = [ "openwith_${arch}" ];
22
23
···
32
33
license = licenses.unlicense;
33
34
maintainers = with maintainers; [ zowoq ];
34
35
platforms = [ "aarch64-darwin" "x86_64-darwin" ];
35
-
broken = stdenv.isx86_64; # https://hydra.nixos.org/build/219354133/nixlog/3
36
36
};
37
37
}
+1
-3
pkgs/top-level/darwin-packages.nix
+1
-3
pkgs/top-level/darwin-packages.nix
···
172
172
inherit (apple_sdk_11_0.libs) simd;
173
173
};
174
174
175
-
openwith = pkgs.darwin.apple_sdk_11_0.callPackage ../os-specific/darwin/openwith {
176
-
inherit (apple_sdk_11_0.frameworks) AppKit Foundation UniformTypeIdentifiers;
177
-
};
175
+
openwith = callPackage ../os-specific/darwin/openwith { };
178
176
179
177
stubs = pkgs.callPackages ../os-specific/darwin/stubs { };
180
178