MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-16 14:54:29 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

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 , stdenv
, fetchFromGitHub , fetchFromGitHub
, autoreconfHook , autoreconfHook
, fuse , fuse2
, unrar_6 , unrar_6
}: }:
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
''; '';
nativeBuildInputs = [ autoreconfHook ]; nativeBuildInputs = [ autoreconfHook ];
buildInputs = [ fuse unrar_6 ]; buildInputs = [ fuse2 unrar_6 ];
configureFlags = [ configureFlags = [
"--with-unrar=${unrar_6.src}/unrar" "--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 { fusePackages = dontRecurseIntoAttrs (callPackage ../os-specific/linux/fuse {
util-linux = util-linuxMinimal; 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; fuse3 = fusePackages.fuse_3;
fuse-common = hiPrio fusePackages.fuse_3.common; fuse-common = hiPrio fusePackages.fuse_3.common;