Unverified Commit 42cd414c authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #301211 from wegank/fuse2-init 

fuse2: add to top-level
parents d5793186 4e71d4b8

pkgs/tools/filesystems/rar2fs/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -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"

pkgs/top-level/all-packages.nix

+2 −1
Original line number Diff line number Diff line
@@ -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;