about summary refs log tree commit diff
path: root/pkgs/os-specific
diff options
context:
space:
mode:
authorMatthew Bauer <mjbauer95@gmail.com>2021-01-20 16:09:41 -0600
committerGitHub <noreply@github.com>2021-01-20 16:09:41 -0600
commitba5f50a76c352df9bbe8ca5771a20d014c10aa99 (patch)
tree628bf95b00b88ec5b78d8791cc06e8bf6da4456e /pkgs/os-specific
parentf1d3b04c0422a4317150ba98ba1931bf94ae0c82 (diff)
parentdcbbbcdb057a5c0d3c094cd436603b3437866001 (diff)
downloadnixlib-ba5f50a76c352df9bbe8ca5771a20d014c10aa99.tar
nixlib-ba5f50a76c352df9bbe8ca5771a20d014c10aa99.tar.gz
nixlib-ba5f50a76c352df9bbe8ca5771a20d014c10aa99.tar.bz2
nixlib-ba5f50a76c352df9bbe8ca5771a20d014c10aa99.tar.lz
nixlib-ba5f50a76c352df9bbe8ca5771a20d014c10aa99.tar.xz
nixlib-ba5f50a76c352df9bbe8ca5771a20d014c10aa99.tar.zst
nixlib-ba5f50a76c352df9bbe8ca5771a20d014c10aa99.zip
Merge pull request #107924 from matthewbauer/fix-duti
Fix duti on macOS Big Sur
Diffstat (limited to 'pkgs/os-specific')
-rw-r--r--pkgs/os-specific/darwin/duti/default.nix20
1 files changed, 14 insertions, 6 deletions
diff --git a/pkgs/os-specific/darwin/duti/default.nix b/pkgs/os-specific/darwin/duti/default.nix
index 5c63b8e0dfb3..9daed151ce48 100644
--- a/pkgs/os-specific/darwin/duti/default.nix
+++ b/pkgs/os-specific/darwin/duti/default.nix
@@ -1,17 +1,25 @@
-{stdenv, lib, fetchFromGitHub, autoreconfHook, darwin}:
+{stdenv, lib, fetchFromGitHub, autoreconfHook, ApplicationServices}:
 
 stdenv.mkDerivation rec {
   pname = "duti";
-  version = "1.5.4pre";
+  version = "1.5.5pre";
   src = fetchFromGitHub {
     owner = "moretension";
     repo = pname;
-    rev = "7dbcae86f99fedef5a6c4311f032a0f1ca0539cc";
-    sha256 = "1z9sa0yk87vs57d5338y6lvm1v1vvynxb7dy1x5aqzkcr0imhljl";
+    rev = "fe3d3dc411bcea6af7a8cbe53c0e08ed5ecacdb2";
+    sha256 = "1pg4i6ghpib2gy1sqpml7dbnhr1vbr43fs2pqkd09i4w3nmgpic9";
   };
+
   nativeBuildInputs = [autoreconfHook];
-  buildInputs = [darwin.apple_sdk.frameworks.ApplicationServices];
-  configureFlags = ["--with-macosx-sdk=/homeless-shelter"];
+  buildInputs = [ApplicationServices];
+  configureFlags = [
+    "--with-macosx-sdk=/homeless-shelter"
+
+    # needed to prevent duti from trying to guess our sdk
+    # NOTE: this is different than stdenv.hostPlatform.config!
+    "--host=x86_64-apple-darwin18"
+  ];
+
   meta = with lib; {
     description = "A command-line tool to select default applications for document types and URL schemes on Mac OS X";
     longDescription = ''