Commit e5d9b197 authored by zowoq's avatar zowoq
Browse files

darwin.openwith: unbreak on x86_64-darwin

parent d1414f54

pkgs/os-specific/darwin/openwith/default.nix

+3 −3
Original line number Diff line number Diff line 
{ 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

  };

}

pkgs/top-level/darwin-packages.nix

+1 −3
Original line number Diff line number Diff line
@@ -172,9 +172,7 @@ impure-cmds // appleSourcePackages // chooseLibs // { 
    inherit (apple_sdk_11_0.libs) simd;

  };



  openwith = pkgs.darwin.apple_sdk_11_0.callPackage ../os-specific/darwin/openwith {

    inherit (apple_sdk_11_0.frameworks) AppKit Foundation UniformTypeIdentifiers;

  };

  openwith = callPackage ../os-specific/darwin/openwith { };



  stubs = pkgs.callPackages ../os-specific/darwin/stubs { };