git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #107924 from matthewbauer/fix-duti

Fix duti on macOS Big Sur

commitba5f50a76c352df9bbe8ca5771a20d014c10aa99 authorMatthew Bauer <mjbauer95@gmail.com> dateWed 20 Jan 2021, 16:09 (6 years ago) parentf1d3b04dcbbbcd
2 files changed+17−7
pkgs/os-specific/darwin/duti/default.nix+14−6 pkgs/top-level/all-packages.nix+3−1
pkgs/os-specific/darwin/duti/default.nix+14−6
@@ -1,17 +1,25 @@
1−{stdenv, lib, fetchFromGitHub, autoreconfHook, darwin}:
1+{stdenv, lib, fetchFromGitHub, autoreconfHook, ApplicationServices}:
22
33stdenv.mkDerivation rec {
44 pname = "duti";
5− version = "1.5.4pre";
5+ version = "1.5.5pre";
66 src = fetchFromGitHub {
77 owner = "moretension";
88 repo = pname;
9− rev = "7dbcae86f99fedef5a6c4311f032a0f1ca0539cc";
10− sha256 = "1z9sa0yk87vs57d5338y6lvm1v1vvynxb7dy1x5aqzkcr0imhljl";
9+ rev = "fe3d3dc411bcea6af7a8cbe53c0e08ed5ecacdb2";
10+ sha256 = "1pg4i6ghpib2gy1sqpml7dbnhr1vbr43fs2pqkd09i4w3nmgpic9";
1111 };
12+
1213 nativeBuildInputs = [autoreconfHook];
13− buildInputs = [darwin.apple_sdk.frameworks.ApplicationServices];
14− configureFlags = ["--with-macosx-sdk=/homeless-shelter"];
14+ buildInputs = [ApplicationServices];
15+ configureFlags = [
16+ "--with-macosx-sdk=/homeless-shelter"
17+
18+ # needed to prevent duti from trying to guess our sdk
19+ # NOTE: this is different than stdenv.hostPlatform.config!
20+ "--host=x86_64-apple-darwin18"
21+ ];
22+
1523 meta = with lib; {
1624 description = "A command-line tool to select default applications for document types and URL schemes on Mac OS X";
1725 longDescription = ''
pkgs/top-level/all-packages.nix+3−1
@@ -29514,7 +29514,9 @@ in
2951429514
2951529515 phonetisaurus = callPackage ../development/libraries/phonetisaurus {};
2951629516
29517− duti = callPackage ../os-specific/darwin/duti {};
29517+ duti = callPackage ../os-specific/darwin/duti {
29518+ inherit (darwin.apple_sdk.frameworks) ApplicationServices;
29519+ };
2951829520
2951929521 dnstracer = callPackage ../tools/networking/dnstracer {
2952029522 inherit (darwin) libresolv;