From 855652d14d83420b8ca15d45a207504093a02622 Mon Sep 17 00:00:00 2001 From: Luflosi Date: Sun, 31 May 2026 20:39:03 +0200 Subject: [PATCH 1/2] mp3fs: 1.1.1 -> 1.1.1-unstable-2023-01-29 This is needed in order to be able to cleanly apply a patch in the next commit. The `postPatch` was made obsolete by https://github.com/khenriks/mp3fs/commit/36d11d387c66037768d536cac855ae54c04438e4. --- pkgs/by-name/mp/mp3fs/package.nix | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/mp/mp3fs/package.nix b/pkgs/by-name/mp/mp3fs/package.nix index f14c129cddd8..d5815c1c0fe5 100644 --- a/pkgs/by-name/mp/mp3fs/package.nix +++ b/pkgs/by-name/mp/mp3fs/package.nix @@ -15,21 +15,15 @@ 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()" - ''; - nativeBuildInputs = [ autoreconfHook pkg-config From ea812c1006ae44a709b38d9247918ed272bacdd8 Mon Sep 17 00:00:00 2001 From: Luflosi Date: Sun, 31 May 2026 20:47:49 +0200 Subject: [PATCH 2/2] mp3fs: use fuse3 fuse (2.x) is being deprecated, so replace it with fuse3 (3.x). See https://github.com/NixOS/nixpkgs/issues/526161. --- pkgs/by-name/mp/mp3fs/package.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mp/mp3fs/package.nix b/pkgs/by-name/mp/mp3fs/package.nix index d5815c1c0fe5..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, @@ -24,6 +25,15 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-lueF8fEV+0LQOxf2MhK9dPWkfsTF4nP3PijqjJvDPzo="; }; + 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 pkg-config @@ -32,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ flac - fuse + fuse3 lame libid3tag libvorbis