mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-11-12 03:56:17 +03:00
lvm2: 2.03.14 -> 2.03.15
This commit is contained in:
parent
60c52a73f1
commit
ce8670619d
@ -1,4 +1,4 @@
|
||||
import ./common.nix {
|
||||
version = "2.03.14";
|
||||
sha256 = "0p5077h3z7mrr0b49ikmhlhrs4v4qb530raypk3y72ja125bqqsa";
|
||||
version = "2.03.15";
|
||||
sha256 = "17n9xl01by7dcbjwjnr6b4rrkp2frz8hwnjl59svsyp13sjq6llk";
|
||||
}
|
||||
|
@ -63,6 +63,7 @@ stdenv.mkDerivation rec {
|
||||
preConfigure = ''
|
||||
sed -i /DEFAULT_SYS_DIR/d Makefile.in
|
||||
sed -i /DEFAULT_PROFILE_DIR/d conf/Makefile.in
|
||||
'' + lib.optionalString (lib.versionOlder version "2.03.15") ''
|
||||
substituteInPlace scripts/lvm2_activation_generator_systemd_red_hat.c \
|
||||
--replace /usr/bin/udevadm /run/current-system/systemd/bin/udevadm
|
||||
# https://github.com/lvmteam/lvm2/issues/36
|
||||
@ -82,7 +83,7 @@ stdenv.mkDerivation rec {
|
||||
sed -i 's|^#define LVM_CONFIGURE_LINE.*$|#define LVM_CONFIGURE_LINE "<removed>"|g' ./include/configure.h
|
||||
'';
|
||||
|
||||
patches = [
|
||||
patches = lib.optionals (lib.versionOlder version "2.03.15") [
|
||||
# Musl fixes from Alpine.
|
||||
./fix-stdio-usage.patch
|
||||
(fetchpatch {
|
||||
|
Loading…
Reference in New Issue
Block a user