git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #146141 from SuperSandro2000/netplan
93fdfcbMaciej Krüger
pkgs/tools/admin/netplan/default.nix+7−6
compare with master
unifiedsplit
@@ -20,7 +20,6 @@ stdenv.mkDerivation rec {
20 repo = "netplan";
20 repo = "netplan";
21 rev = version;
21 rev = version;
22 hash = "sha256-d8Ze8S/w2nyJkATzLfizMqmr7ad2wrK1mjADClee6WE=";
22 hash = "sha256-d8Ze8S/w2nyJkATzLfizMqmr7ad2wrK1mjADClee6WE=";
23− fetchSubmodules = false;
24 };
23 };
25
24
26 nativeBuildInputs = [
25 nativeBuildInputs = [
@@ -39,12 +38,14 @@ stdenv.mkDerivation rec {
39 ];
38 ];
40
39
41 postPatch = ''
40 postPatch = ''
41+ substituteInPlace netplan/cli/utils.py \
42− substituteInPlace netplan/cli/utils.py --replace "/lib/netplan/generate" "$out/lib/netplan/generate"
42+ --replace "/lib/netplan/generate" "$out/lib/netplan/generate" \
43− substituteInPlace netplan/cli/utils.py --replace "ctypes.util.find_library('netplan')" "\"$out/lib/libnetplan.so\""
43+ --replace "ctypes.util.find_library('netplan')" "\"$out/lib/libnetplan.so\""
44
44
45+ substituteInPlace Makefile \
45− substituteInPlace Makefile --replace 'SYSTEMD_GENERATOR_DIR=' 'SYSTEMD_GENERATOR_DIR ?= ' \
46+ --replace 'SYSTEMD_GENERATOR_DIR=' 'SYSTEMD_GENERATOR_DIR ?= ' \
46− --replace 'SYSTEMD_UNIT_DIR=' 'SYSTEMD_UNIT_DIR ?= ' \
47+ --replace 'SYSTEMD_UNIT_DIR=' 'SYSTEMD_UNIT_DIR ?= ' \
47− --replace 'BASH_COMPLETIONS_DIR=' 'BASH_COMPLETIONS_DIR ?= '
48+ --replace 'BASH_COMPLETIONS_DIR=' 'BASH_COMPLETIONS_DIR ?= '
48
49
49 # from upstream https://github.com/canonical/netplan/blob/ee0d5df7b1dfbc3197865f02c724204b955e0e58/rpm/netplan.spec#L81
50 # from upstream https://github.com/canonical/netplan/blob/ee0d5df7b1dfbc3197865f02c724204b955e0e58/rpm/netplan.spec#L81
50 sed -e "s/-Werror//g" -i Makefile
51 sed -e "s/-Werror//g" -i Makefile