cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

pkgsMusl.polkit: fix build

Browse source
This commit is contained in:
Yureka 2022-08-13 14:37:48 +02:00 committed by Yuka
parent bbedd67512
commit f95d9a668e
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
pkgs/development/libraries/polkit/default.nix
View file

@ -57,14 +57,13 @@ stdenv.mkDerivation rec {
url = "https://gitlab.freedesktop.org/polkit/polkit/-/commit/7ba07551dfcd4ef9a87b8f0d9eb8b91fabcb41b3.patch"; url = "https://gitlab.freedesktop.org/polkit/polkit/-/commit/7ba07551dfcd4ef9a87b8f0d9eb8b91fabcb41b3.patch";
sha256 = "ebbLILncq1hAZTBMsLm+vDGw6j0iQ0crGyhzyLZQgKA="; sha256 = "ebbLILncq1hAZTBMsLm+vDGw6j0iQ0crGyhzyLZQgKA=";
}) })
] ++ lib.optionals stdenv.hostPlatform.isMusl [
# Make netgroup support optional (musl does not have it) # Make netgroup support optional (musl does not have it)
# Upstream MR: https://gitlab.freedesktop.org/polkit/polkit/merge_requests/10 # Upstream MR: https://gitlab.freedesktop.org/polkit/polkit/merge_requests/10
# We use the version of the patch that Alpine uses successfully. # NOTE: Remove after the next release
(fetchpatch { (fetchpatch {
name = "make-innetgr-optional.patch"; name = "make-innetgr-optional.patch";
url = "https://git.alpinelinux.org/aports/plain/community/polkit/make-innetgr-optional.patch?id=424ecbb6e9e3a215c978b58c05e5c112d88dddfc"; url = "https://gitlab.freedesktop.org/polkit/polkit/-/commit/b57deee8178190a7ecc75290fa13cf7daabc2c66.patch";
sha256 = "0iyiksqk29sizwaa4623bv683px1fny67639qpb1him89hza00wy"; sha256 = "8te6gatT9Fp+fIT05fQBym5mEwHeHfaUNUNEMfSbtLc=";
}) })
]; ];
@ -153,7 +152,7 @@ stdenv.mkDerivation rec {
--replace /bin/false ${coreutils}/bin/false --replace /bin/false ${coreutils}/bin/false
''; '';
postConfigure = '' postConfigure = lib.optionalString (!stdenv.hostPlatform.isMusl) ''
# Unpacked by meson # Unpacked by meson
chmod +x subprojects/mocklibc-1.0/bin/mocklibc chmod +x subprojects/mocklibc-1.0/bin/mocklibc
patchShebangs subprojects/mocklibc-1.0/bin/mocklibc patchShebangs subprojects/mocklibc-1.0/bin/mocklibc