From 595c25f10535b4cde8b15109f8f36e387cce58c6 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 1 Nov 2021 14:51:12 +0100 Subject: [PATCH] polkit: Fix regression in paths in pkg-config file resulting from discrepancy between Meson and Autotools build systems. --- pkgs/development/libraries/polkit/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/polkit/default.nix b/pkgs/development/libraries/polkit/default.nix index b2d1b35f05e1..623da157a633 100644 --- a/pkgs/development/libraries/polkit/default.nix +++ b/pkgs/development/libraries/polkit/default.nix @@ -51,7 +51,14 @@ stdenv.mkDerivation rec { sha256 = "oEaRf1g13zKMD+cP1iwIA6jaCDwvNfGy2i8xY8vuVSo="; }; - patches = lib.optionals stdenv.hostPlatform.isMusl [ + patches = [ + # Allow changing base for paths in pkg-config file as before. + # https://gitlab.freedesktop.org/polkit/polkit/-/merge_requests/100 + (fetchpatch { + url = "https://gitlab.freedesktop.org/polkit/polkit/-/commit/7ba07551dfcd4ef9a87b8f0d9eb8b91fabcb41b3.patch"; + sha256 = "1iyiksqk29sizwaa4623bv683px1fny67639qpb1him89hza00wy"; + }) + ] ++ lib.optionals stdenv.hostPlatform.isMusl [ # Make netgroup support optional (musl does not have it) # Upstream MR: https://gitlab.freedesktop.org/polkit/polkit/merge_requests/10 # We use the version of the patch that Alpine uses successfully.