Merge pull request #146141 from SuperSandro2000/netplan
This commit is contained in:
commit
93fdfcba63
1 changed files with 7 additions and 6 deletions
|
@ -20,7 +20,6 @@ stdenv.mkDerivation rec {
|
|||
repo = "netplan";
|
||||
rev = version;
|
||||
hash = "sha256-d8Ze8S/w2nyJkATzLfizMqmr7ad2wrK1mjADClee6WE=";
|
||||
fetchSubmodules = false;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -39,12 +38,14 @@ stdenv.mkDerivation rec {
|
|||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace netplan/cli/utils.py --replace "/lib/netplan/generate" "$out/lib/netplan/generate"
|
||||
substituteInPlace netplan/cli/utils.py --replace "ctypes.util.find_library('netplan')" "\"$out/lib/libnetplan.so\""
|
||||
substituteInPlace netplan/cli/utils.py \
|
||||
--replace "/lib/netplan/generate" "$out/lib/netplan/generate" \
|
||||
--replace "ctypes.util.find_library('netplan')" "\"$out/lib/libnetplan.so\""
|
||||
|
||||
substituteInPlace Makefile --replace 'SYSTEMD_GENERATOR_DIR=' 'SYSTEMD_GENERATOR_DIR ?= ' \
|
||||
--replace 'SYSTEMD_UNIT_DIR=' 'SYSTEMD_UNIT_DIR ?= ' \
|
||||
--replace 'BASH_COMPLETIONS_DIR=' 'BASH_COMPLETIONS_DIR ?= '
|
||||
substituteInPlace Makefile \
|
||||
--replace 'SYSTEMD_GENERATOR_DIR=' 'SYSTEMD_GENERATOR_DIR ?= ' \
|
||||
--replace 'SYSTEMD_UNIT_DIR=' 'SYSTEMD_UNIT_DIR ?= ' \
|
||||
--replace 'BASH_COMPLETIONS_DIR=' 'BASH_COMPLETIONS_DIR ?= '
|
||||
|
||||
# from upstream https://github.com/canonical/netplan/blob/ee0d5df7b1dfbc3197865f02c724204b955e0e58/rpm/netplan.spec#L81
|
||||
sed -e "s/-Werror//g" -i Makefile
|
||||
|
|
Loading…
Reference in a new issue