colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #301211 from wegank/fuse2-init

Browse Source 
fuse2: add to top-level
This commit is contained in:
Weijia Wang 2024-04-13 23:20:13 +02:00 committed by GitHub
commit 42cd414c7f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/tools/filesystems/rar2fs/default.nix
View File

@ -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"

3
pkgs/top-level/all-packages.nix
View File

@ -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;