diff --git a/pkgs/by-name/mp/mp3fs/package.nix b/pkgs/by-name/mp/mp3fs/package.nix index f14c129cddd8..82bffadb83ed 100644 --- a/pkgs/by-name/mp/mp3fs/package.nix +++ b/pkgs/by-name/mp/mp3fs/package.nix @@ -2,8 +2,9 @@ lib, stdenv, fetchFromGitHub, + fetchpatch2, flac, - fuse, + fuse3, lame, libid3tag, libvorbis, @@ -15,20 +16,23 @@ stdenv.mkDerivation (finalAttrs: { pname = "mp3fs"; - version = "1.1.1"; + version = "1.1.1-unstable-2023-01-29"; src = fetchFromGitHub { owner = "khenriks"; repo = "mp3fs"; - rev = "v${finalAttrs.version}"; - sha256 = "sha256-dF+DfkNKvYOucS6KjYR1MMGxayM+1HVS8mbmaavmgKM="; + rev = "cd2ca80eb3912ff8385e6d537df10d9a768a3a96"; + hash = "sha256-lueF8fEV+0LQOxf2MhK9dPWkfsTF4nP3PijqjJvDPzo="; }; - postPatch = '' - substituteInPlace src/mp3fs.cc \ - --replace-fail "#include " "" \ - --replace-fail "osxfuse_version()" "fuse_version()" - ''; + patches = [ + (fetchpatch2 { + name = "Enable fuse3 support.patch"; + # https://github.com/khenriks/mp3fs/pull/81 + url = "https://github.com/khenriks/mp3fs/commit/6e1326de4a19b236eef88b89599755adf394526f.patch?full_index=1"; + hash = "sha256-V2HZy0jiXAHGAjre+QtCdGev7maWJ8hW3F2e/87CEKA="; + }) + ]; nativeBuildInputs = [ autoreconfHook @@ -38,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ flac - fuse + fuse3 lame libid3tag libvorbis