diff --git a/pkgs/tools/networking/dae/default.nix b/pkgs/tools/networking/dae/default.nix index 666340d1fbe2..cc95bb4dc826 100644 --- a/pkgs/tools/networking/dae/default.nix +++ b/pkgs/tools/networking/dae/default.nix @@ -1,29 +1,25 @@ { lib , clang , fetchFromGitHub -, symlinkJoin , buildGoModule -, makeWrapper -, v2ray-geoip -, v2ray-domain-list-community }: buildGoModule rec { pname = "dae"; - version = "0.2.4"; + version = "0.3.0"; src = fetchFromGitHub { owner = "daeuniverse"; repo = "dae"; rev = "v${version}"; - hash = "sha256-MVmx37q5nbgaUehPJ2C2UjVyx48/U/vA3NeBx6Zcmg8="; + hash = "sha256-WiJqhXYehuUCLEuVbsQkmTntuH1srtePtZgYBSTbxiw="; fetchSubmodules = true; }; - vendorHash = "sha256-oeMAekLWRJzmkmge4LmrVSFRzHZ/dStX+CvLtuYOsog="; + vendorHash = "sha256-fb4PEMhV8+5zaRJyl+nYi2BHcOUDUVAwxce2xaRt5JA="; proxyVendor = true; - nativeBuildInputs = [ clang makeWrapper ]; + nativeBuildInputs = [ clang ]; ldflags = [ "-s" @@ -33,7 +29,7 @@ buildGoModule rec { ]; preBuild = '' - make CFLAGS="-D__REMOVE_BPF_PRINTK -fno-stack-protector" \ + make CFLAGS="-D__REMOVE_BPF_PRINTK -fno-stack-protector -Wno-unused-command-line-argument" \ NOSTRIP=y \ ebpf ''; @@ -41,15 +37,8 @@ buildGoModule rec { # network required doCheck = false; - assetsDrv = symlinkJoin { - name = "dae-assets"; - paths = [ v2ray-geoip v2ray-domain-list-community ]; - }; - postInstall = '' install -Dm444 install/dae.service $out/lib/systemd/system/dae.service - wrapProgram $out/bin/dae \ - --suffix DAE_LOCATION_ASSET : $assetsDrv/share/v2ray substituteInPlace $out/lib/systemd/system/dae.service \ --replace /usr/bin/dae $out/bin/dae '';