From c988fcc9b0cffbd2684e996d77a871f32741b3b8 Mon Sep 17 00:00:00 2001 From: Yureka Date: Sun, 27 Nov 2022 14:24:24 +0100 Subject: [PATCH] pkgsMusl.libeatmydata: fix build --- pkgs/development/libraries/libeatmydata/default.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libeatmydata/default.nix b/pkgs/development/libraries/libeatmydata/default.nix index 886caaada47b..bec3bba51e6e 100644 --- a/pkgs/development/libraries/libeatmydata/default.nix +++ b/pkgs/development/libraries/libeatmydata/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, strace, which }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, strace, which }: stdenv.mkDerivation rec { pname = "libeatmydata"; @@ -11,7 +11,16 @@ stdenv.mkDerivation rec { sha256 = "0sx803h46i81h67xbpd3c7ky0nhaw4gij214nsx4lqig70223v9r"; }; - patches = [ ./find-shell-lib.patch ]; + patches = [ + ./find-shell-lib.patch + + # Fixes "error: redefinition of 'open'" on musl + (fetchpatch { + url = "https://raw.githubusercontent.com/void-linux/void-packages/861ac185a6b60134292ff93d40e40b5391d0aa8e/srcpkgs/libeatmydata/patches/musl.patch"; + stripLen = 1; + sha256 = "sha256-yfMfISbYL7r/R2C9hYPjvGcpUB553QSiW0rMrxG11Oo="; + }) + ]; patchFlags = [ "-p0" ];