diff options
| author | Will Dietz <w@wdtz.org> | 2018-01-14 00:55:12 -0600 |
|---|---|---|
| committer | Will Dietz <w@wdtz.org> | 2018-02-13 09:44:55 -0600 |
| commit | e606e4d6a9280eccca9a15e08c7e5b62b95575b0 (patch) | |
| tree | 50a2c4f5ae16ed5552f96cd1eb4f1e385ba08e83 /pkgs/os-specific/linux/lvm2 | |
| parent | e25153a9b860153a28f1d4e11156c49d9d8df908 (diff) | |
| download | nixpkgs-e606e4d6a9280eccca9a15e08c7e5b62b95575b0.tar nixpkgs-e606e4d6a9280eccca9a15e08c7e5b62b95575b0.tar.gz nixpkgs-e606e4d6a9280eccca9a15e08c7e5b62b95575b0.tar.bz2 nixpkgs-e606e4d6a9280eccca9a15e08c7e5b62b95575b0.tar.lz nixpkgs-e606e4d6a9280eccca9a15e08c7e5b62b95575b0.tar.xz nixpkgs-e606e4d6a9280eccca9a15e08c7e5b62b95575b0.tar.zst nixpkgs-e606e4d6a9280eccca9a15e08c7e5b62b95575b0.zip | |
lvm2: musl patches from alpine
Diffstat (limited to 'pkgs/os-specific/linux/lvm2')
| -rw-r--r-- | pkgs/os-specific/linux/lvm2/default.nix | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/lvm2/default.nix b/pkgs/os-specific/linux/lvm2/default.nix index d6c1504fdf4..bd84e121a7d 100644 --- a/pkgs/os-specific/linux/lvm2/default.nix +++ b/pkgs/os-specific/linux/lvm2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, systemd, libudev, utillinux, coreutils, libuuid +{ stdenv, fetchurl, fetchpatch, pkgconfig, systemd, libudev, utillinux, coreutils, libuuid , thin-provisioning-tools, enable_dmeventd ? false }: let @@ -41,6 +41,23 @@ stdenv.mkDerivation { enableParallelBuilding = true; #patches = [ ./purity.patch ]; + patches = stdenv.lib.optionals stdenv.hostPlatform.isMusl [ + (fetchpatch { + name = "fix-stdio-usage.patch"; + url = "https://git.alpinelinux.org/cgit/aports/plain/main/lvm2/fix-stdio-usage.patch?h=3.7-stable&id=31bd4a8c2dc00ae79a821f6fe0ad2f23e1534f50"; + sha256 = "0m6wr6qrvxqi2d2h054cnv974jq1v65lqxy05g1znz946ga73k3p"; + }) + (fetchpatch { + name = "mallinfo.patch"; + url = "https://git.alpinelinux.org/cgit/aports/plain/main/lvm2/mallinfo.patch?h=3.7-stable&id=31bd4a8c2dc00ae79a821f6fe0ad2f23e1534f50"; + sha256 = "0g6wlqi215i5s30bnbkn8w7axrs27y3bnygbpbnf64wwx7rxxlj0"; + }) + (fetchpatch { + name = "mlockall-default-config.patch"; + url = "https://git.alpinelinux.org/cgit/aports/plain/main/lvm2/mlockall-default-config.patch?h=3.7-stable&id=31bd4a8c2dc00ae79a821f6fe0ad2f23e1534f50"; + sha256 = "1ivbj3sphgf8n1ykfiv5rbw7s8dgnj5jcr9jl2v8cwf28lkacw5l"; + }) + ]; # To prevent make install from failing. preInstall = "installFlags=\"OWNER= GROUP= confdir=$out/etc\""; |