jolheiser/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pkgsStatic.linux-pam: Remove no longer necessary musl patches.

Browse Source 
See https://github.com/NixOS/nixpkgs/pull/109906#issuecomment-775630916.

These Alpine patches:

    libpam-fix-build-with-eglibc-2.16.patch
    fix-compat.patch

were removed in:

    https://git.alpinelinux.org/aports/commit/main/linux-pam?id=9ba93cf3f515b4f0b9b3802b84d42c4e436afe8b
This commit is contained in:
Niklas Hambüchen 2021-02-09 04:26:15 +01:00
parent 1e6c110bc4
commit da899edeec
1 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/os-specific/linux/pam/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, buildPackages, fetchurl, fetchpatch, flex, cracklib, db4, gettext { lib, stdenv, buildPackages, fetchurl, flex, cracklib, db4, gettext
, nixosTests , nixosTests
}: }:
@ -11,17 +11,6 @@ stdenv.mkDerivation rec {
sha256 = "sha256-IB1AcwsRNbGzzeoJ8sKKxjTXMYHM0Bcs7d7jZJxXkvw="; sha256 = "sha256-IB1AcwsRNbGzzeoJ8sKKxjTXMYHM0Bcs7d7jZJxXkvw=";
}; };
patches = lib.optionals (stdenv.hostPlatform.libc == "musl") [
(fetchpatch {
url = "https://git.alpinelinux.org/aports/plain/main/linux-pam/fix-compat.patch?id=05a62bda8ec255d7049a2bd4cf0fdc4b32bdb2cc";
sha256 = "1h5yp5h2mqp1fcwiwwklyfpa69a3i03ya32pivs60fd7g5bqa7sf";
})
(fetchpatch {
url = "https://git.alpinelinux.org/aports/plain/main/linux-pam/libpam-fix-build-with-eglibc-2.16.patch?id=05a62bda8ec255d7049a2bd4cf0fdc4b32bdb2cc";
sha256 = "1ib6shhvgzinjsc603k2x1lxh9dic6qq449fnk110gc359m23j81";
})
];
outputs = [ "out" "doc" "man" /* "modules" */ ]; outputs = [ "out" "doc" "man" /* "modules" */ ];
depsBuildBuild = [ buildPackages.stdenv.cc ]; depsBuildBuild = [ buildPackages.stdenv.cc ];