git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #146141 from SuperSandro2000/netplan
commit93fdfcba6396fef7b5cd890b17144776ad0e5a00 authorMaciej Krüger <mkg20001@gmail.com> dateMon 15 Nov 2021, 15:51 (5 years ago) parent032b82f44be59a
1 file changed+7−6
pkgs/tools/admin/netplan/default.nix+7−6
pkgs/tools/admin/netplan/default.nix+7−6
@@ -20,7 +20,6 @@ stdenv.mkDerivation rec {
2020 repo = "netplan";
2121 rev = version;
2222 hash = "sha256-d8Ze8S/w2nyJkATzLfizMqmr7ad2wrK1mjADClee6WE=";
23− fetchSubmodules = false;
2423 };
2524
2625 nativeBuildInputs = [
@@ -39,12 +38,14 @@ stdenv.mkDerivation rec {
3938 ];
4039
4140 postPatch = ''
42− substituteInPlace netplan/cli/utils.py --replace "/lib/netplan/generate" "$out/lib/netplan/generate"
43− substituteInPlace netplan/cli/utils.py --replace "ctypes.util.find_library('netplan')" "\"$out/lib/libnetplan.so\""
41+ substituteInPlace netplan/cli/utils.py \
42+ --replace "/lib/netplan/generate" "$out/lib/netplan/generate" \
43+ --replace "ctypes.util.find_library('netplan')" "\"$out/lib/libnetplan.so\""
4444
45− substituteInPlace Makefile --replace 'SYSTEMD_GENERATOR_DIR=' 'SYSTEMD_GENERATOR_DIR ?= ' \
46− --replace 'SYSTEMD_UNIT_DIR=' 'SYSTEMD_UNIT_DIR ?= ' \
47− --replace 'BASH_COMPLETIONS_DIR=' 'BASH_COMPLETIONS_DIR ?= '
45+ substituteInPlace Makefile \
46+ --replace 'SYSTEMD_GENERATOR_DIR=' 'SYSTEMD_GENERATOR_DIR ?= ' \
47+ --replace 'SYSTEMD_UNIT_DIR=' 'SYSTEMD_UNIT_DIR ?= ' \
48+ --replace 'BASH_COMPLETIONS_DIR=' 'BASH_COMPLETIONS_DIR ?= '
4849
4950 # from upstream https://github.com/canonical/netplan/blob/ee0d5df7b1dfbc3197865f02c724204b955e0e58/rpm/netplan.spec#L81
5051 sed -e "s/-Werror//g" -i Makefile