diff options
| author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2024-04-13 23:20:13 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-13 23:20:13 +0200 |
| commit | 42cd414c7f308b5378ecd98fc6aeb23cc50d9299 (patch) | |
| tree | 6538eec6a57958d16c2a1bb86baaa7be3d0a8fea /pkgs | |
| parent | d5793186e8b239fe551839c3162c26873709e799 (diff) | |
| parent | 4e71d4b8ed88214296b4835bd8e46bde16bc888b (diff) | |
Merge pull request #301211 from wegank/fuse2-init
fuse2: add to top-level
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/tools/filesystems/rar2fs/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/tools/filesystems/rar2fs/default.nix b/pkgs/tools/filesystems/rar2fs/default.nix index 0c752e7114534..925a600b64e2b 100644 --- a/pkgs/tools/filesystems/rar2fs/default.nix +++ b/pkgs/tools/filesystems/rar2fs/default.nix @@ -2,7 +2,7 @@ , stdenv , fetchFromGitHub , autoreconfHook -, fuse +, fuse2 , unrar_6 }: @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ fuse unrar_6 ]; + buildInputs = [ fuse2 unrar_6 ]; configureFlags = [ "--with-unrar=${unrar_6.src}/unrar" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d8856acaab06a..2f43f7eb1759a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27311,7 +27311,8 @@ with pkgs; fusePackages = dontRecurseIntoAttrs (callPackage ../os-specific/linux/fuse { util-linux = util-linuxMinimal; }); - fuse = lowPrio (if stdenv.isDarwin then macfuse-stubs else fusePackages.fuse_2); + fuse = fuse2; + fuse2 = lowPrio (if stdenv.isDarwin then macfuse-stubs else fusePackages.fuse_2); fuse3 = fusePackages.fuse_3; fuse-common = hiPrio fusePackages.fuse_3.common; |