From df05ee79ea51f82c3d1b8bd4d4d6bd01d6b69feb Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Thu, 29 Aug 2024 16:37:43 +0200 Subject: [PATCH] compsize: fix build --- pkgs/os-specific/linux/compsize/default.nix | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/compsize/default.nix b/pkgs/os-specific/linux/compsize/default.nix index 441108b0e54f..a1175df20629 100644 --- a/pkgs/os-specific/linux/compsize/default.nix +++ b/pkgs/os-specific/linux/compsize/default.nix @@ -1,5 +1,17 @@ -{ lib, stdenv, fetchFromGitHub, btrfs-progs }: +{ lib, stdenv, fetchFromGitHub, fetchurl, btrfs-progs }: +let + # https://github.com/kilobyte/compsize/issues/52 + btrfs-progs' = btrfs-progs.overrideAttrs (old: rec { + pname = "btrfs-progs"; + version = "6.10"; + src = fetchurl { + url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz"; + hash = "sha256-M4KoTj/P4f/eoHphqz9OhmZdOPo18fNFSNXfhnQj4N8="; + }; + }); + +in stdenv.mkDerivation rec { pname = "compsize"; version = "1.5"; @@ -11,7 +23,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-OX41ChtHX36lVRL7O2gH21Dfw6GPPEClD+yafR/PFm8="; }; - buildInputs = [ btrfs-progs ]; + buildInputs = [ btrfs-progs' ]; installFlags = [ "PREFIX=${placeholder "out"}"