git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #152151 from trofi/fix-multipath-tools-for-fno-common

multipath-tools: pull upstream fix for -fno-cmmon toolchains

commit7b85ed0723c35f3930ed5ea8908bcbb5248a9e54 authorBobby Rong <rjl931189261@126.com> dateSat 1 Jan 2022, 21:01 (5 years ago) parentedac0bed32fcc6
1 file changed+8−1
pkgs/os-specific/linux/multipath-tools/default.nix+8−1
pkgs/os-specific/linux/multipath-tools/default.nix+8−1
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, pkg-config, perl, lvm2, libaio, gzip, readline, systemd, liburcu, json_c, kmod }:
1+{ lib, stdenv, fetchurl, fetchpatch, pkg-config, perl, lvm2, libaio, gzip, readline, systemd, liburcu, json_c, kmod }:
22
33stdenv.mkDerivation rec {
44 pname = "multipath-tools";
@@ -13,6 +13,13 @@ stdenv.mkDerivation rec {
1313 patches = [
1414 # fix build with json-c 0.14 https://www.redhat.com/archives/dm-devel/2020-May/msg00261.html
1515 ./json-c-0.14.patch
16+
17+ # pull upstream fix for -fno-common toolchains like clang-12
18+ (fetchpatch {
19+ name = "fno-common.patch";
20+ url = "https://github.com/opensvc/multipath-tools/commit/23a9247fa89cd0c84fe7e0f32468fd698b1caa48.patch";
21+ sha256 = "10hq0g2jfkfbmwhm4x4q5cgsswj30lm34ib153alqzjzsxc1hqjk";
22+ })
1623 ];
1724
1825 postPatch = ''