diff --git a/package.nix b/package.nix index 989758c..c12c37b 100644 --- a/package.nix +++ b/package.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { fetchSubmodules = true; }; - patches = [ ./ipb-profile-key.patch ]; + patches = [ ./patches/ipb-profile-key.patch ./patches/tap-name-no-prefix.patch ]; nativeBuildInputs = with pkgs; [ cmake diff --git a/ipb-profile-key.patch b/patches/ipb-profile-key.patch similarity index 100% rename from ipb-profile-key.patch rename to patches/ipb-profile-key.patch diff --git a/patches/tap-name-no-prefix.patch b/patches/tap-name-no-prefix.patch new file mode 100644 index 0000000..17fe0f0 --- /dev/null +++ b/patches/tap-name-no-prefix.patch @@ -0,0 +1,13 @@ +diff --git a/src/Cedar/VLanUnix.c b/src/Cedar/VLanUnix.c +index 784bd74..127d15e 100644 +--- a/src/Cedar/VLanUnix.c ++++ b/src/Cedar/VLanUnix.c +@@ -339,7 +339,7 @@ void GenerateTunName(char *name, char *prefix, char *tun_name, size_t tun_name_l + StrCpy(instance_name_lower, sizeof(instance_name_lower), name); + Trim(instance_name_lower); + StrLower(instance_name_lower); +- Format(tun_name, tun_name_len, "%s_%s", prefix, instance_name_lower); ++ Format(tun_name, tun_name_len, "%s", instance_name_lower); + + tun_name[15] = 0; + }