JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

netplan: remove default value from fetchFromGitHub, cleanup substituteInPlace

Browse Source
This commit is contained in:
Sandro Jäckel 2021-11-15 15:22:03 +01:00
parent d04b41c582
commit 44be59afb9
No known key found for this signature in database
GPG Key ID: B1763F8651144063
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/tools/admin/netplan/default.nix
View File

@ -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