diff options
| author | Bernardo Meurer <bernardo@meurer.org> | 2021-03-24 21:18:40 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-24 21:18:40 +0000 |
| commit | fa9cd72c09fe2e296481c7788bd4126e5eac6d84 (patch) | |
| tree | 6905e2fa7022422090df3c788bc80b40438c1968 /pkgs/top-level | |
| parent | 0ffaecb6f04404db2c739beb167a5942993cfd87 (diff) | |
| parent | b67362d7f70a989a6f4bf6bb106207f53f0c6fe4 (diff) | |
Merge pull request #117360 from midchildan/feat/fuse/darwin
fuse: use macfuse-stubs instead on Darwin
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 3 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d0b90828b87d..d53d3750606e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19286,7 +19286,7 @@ in fusePackages = dontRecurseIntoAttrs (callPackage ../os-specific/linux/fuse { util-linux = util-linuxMinimal; }); - fuse = lowPrio fusePackages.fuse_2; + fuse = lowPrio (if stdenv.isDarwin then macfuse-stubs else fusePackages.fuse_2); fuse3 = fusePackages.fuse_3; fuse-common = hiPrio fusePackages.fuse_3.common; @@ -19425,6 +19425,7 @@ in macfuse-stubs = callPackage ../os-specific/darwin/macfuse { inherit (darwin) libtapi; + inherit (darwin.apple_sdk.frameworks) DiskArbitration; }; osxsnarf = callPackage ../os-specific/darwin/osxsnarf { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 782c0e16326a..c723f37456f6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3974,7 +3974,6 @@ in { llfuse = callPackage ../development/python-modules/llfuse { inherit (pkgs) fuse; - inherit (pkgs.darwin.apple_sdk.frameworks) DiskArbitration; }; llvmlite = callPackage ../development/python-modules/llvmlite { |