From 604fa77ed8f3b1a94dc4590ad54907498d36019e Mon Sep 17 00:00:00 2001 From: Reno Dakota Date: Thu, 16 Jan 2025 11:36:58 +0000 Subject: [PATCH] pmount: add debian patches; fix gcc-14 build https://salsa.debian.org/debian/pmount/-/tree/debian/master/debian/patches --- pkgs/by-name/pm/pmount/package.nix | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/pkgs/by-name/pm/pmount/package.nix b/pkgs/by-name/pm/pmount/package.nix index 7e52083021d4..dcef177fad42 100644 --- a/pkgs/by-name/pm/pmount/package.nix +++ b/pkgs/by-name/pm/pmount/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchurl, + fetchpatch, intltool, ntfs3g, util-linux, @@ -22,6 +23,35 @@ stdenv.mkDerivation rec { sha256 = "db38fc290b710e8e9e9d442da2fb627d41e13b3ee80326c15cc2595ba00ea036"; }; + patches = + let + # https://salsa.debian.org/debian/pmount/-/tree/debian/master/debian/patches + fetchDebPatch = + { name, hash }: + fetchpatch { + inherit name hash; + url = "https://salsa.debian.org/debian/pmount/-/raw/ba05283d4a53aba5349d4397a98d9f45206fb29f/debian/patches/${name}"; + }; + in + map fetchDebPatch [ + { + name = "10_fix-spelling-binary-errors.patch"; + hash = "sha256-G4GsUe1ZdYB7Qv333X1hUjOELITR8A2pqyfEnMDTwHI="; + } + { + name = "20_fix-spelling-manpage-error.patch"; + hash = "sha256-9phF8s7MFSjkhPP24cipeBUps5W1L7YmAE0B1QPx5jk="; + } + { + name = "fix-implicit-function-declaration.patch"; + hash = "sha256-kdwdS9G1X5RtQFKzF6oMIUubGNP7n1ZQNHu8sN1oV4Q="; + } + { + name = "30_exfat-support.patch"; + hash = "sha256-kg9gLhOtdrEDlZfUnT910xI5rNR1zgKKRx2kvFQjbi8="; + } + ]; + nativeBuildInputs = [ intltool util-linux