mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-25 16:33:15 +00:00
Merge pull request #193913 from yu-re-ka/musl-libxcrypt
pkgsMusl.libxcrypt: fix build
This commit is contained in:
commit
ae1d03834e
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config, perl }:
|
||||
{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config, perl, fetchpatch }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libxcrypt";
|
||||
@ -11,6 +11,16 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "sha256-Ohf+RCOXnoCxAFnXXV9e2TCqpfZziQl+FGJTGDSQTF0=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix for tests on musl is being upstreamed:
|
||||
# https://github.com/besser82/libxcrypt/pull/157
|
||||
# Applied in all environments to prevent patchrot
|
||||
(fetchpatch {
|
||||
url = "https://github.com/besser82/libxcrypt/commit/a4228faa0b96986abc076125cf97d352a063d92f.patch";
|
||||
sha256 = "sha256-iGNz8eer6OkA0yR74WisE6GbFTYyXKw7koXl/R7DhVE=";
|
||||
})
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
patchShebangs autogen.sh
|
||||
./autogen.sh
|
||||
|
Loading…
Reference in New Issue
Block a user