udp2raw: ...

2 files changed, 9 insertions, 11 deletions

diff --git a/overlays/udp2raw/package.nix b/overlays/udp2raw/package.nix
index a50d87d4..6612ac3e 100644
--- a/overlays/udp2raw/package.nix
+++ b/overlays/udp2raw/package.nix
@@ -12,9 +12,9 @@ pkgsMusl.stdenv.mkDerivation rec {
   patches = [ ./udp2raw-makefile.patch ];
   configurePhase = "";
   buildPhase = ''
-    make amd64_hw_aes
+    make cc_amd64=''${CXX} amd64_hw_aes
   '';
   installPhase = ''
-    install -Dm755 udp2raw_amd64 $out/bin/udp2raw
+    install -Dm755 udp2raw_amd64_hw_aes $out/bin/udp2raw
   '';
 }
diff --git a/overlays/udp2raw/udp2raw-makefile.patch b/overlays/udp2raw/udp2raw-makefile.patch
index 512c6f8e..264f5cf4 100644
--- a/overlays/udp2raw/udp2raw-makefile.patch
+++ b/overlays/udp2raw/udp2raw-makefile.patch
@@ -1,12 +1,10 @@
 diff --git a/makefile b/makefile
-index e758e68..16a3b23 100755
+index 22c07ae..ddcfbc4 100755
 --- a/makefile
 +++ b/makefile
-@@ -53,6 +53,6 @@ mips24kc_le_asm_aes: git_version
- amd64:git_version
-        ${cc_amd64}   -o ${NAME}_$@    -I. ${SOURCES} ${FLAGS} -lrt -static -O3
- amd64_hw_aes:git_version
--       ${cc_amd64}   -o ${NAME}_$@    -I. ${SOURCES} ${FLAGS} -lrt -static -O0 -fno-omit-frame-pointer -g
-+       ${CXX}   -o ${NAME}_$@    -I. ${SOURCES} ${FLAGS} -lrt -static -O0 -fno-omit-frame-pointer -g
- x86:git_version
-        ${cc_x86}   -o ${NAME}_$@      -I. ${SOURCES} ${FLAGS} -lrt -static -O2 -lgcc_eh -ggdb
+@@ -131,4 +131,4 @@ clean:
+        rm -f git_version.h
+ 
+ git_version:
+-           echo "const char *gitversion = \"$(shell git rev-parse HEAD)\";" > git_version.h
++           echo "const char *gitversion = \"cc6ea766c495cf4c69d1c7485728ba022b0f19de\";" > git_version.h