diff options
| author | Gregor Kleen <gkleen@yggdrasil.li> | 2021-10-10 13:49:33 +0200 |
|---|---|---|
| committer | Gregor Kleen <gkleen@yggdrasil.li> | 2021-10-10 13:49:33 +0200 |
| commit | 5b94c8b0b661526fa9bc235bbf8a6b2691e0d345 (patch) | |
| tree | c722376387d885789974091543cd3559a2ed3eea | |
| parent | e0e60dc08b405f11e6792aa4455e2a385bbc6ab6 (diff) | |
| download | nixos-5b94c8b0b661526fa9bc235bbf8a6b2691e0d345.tar nixos-5b94c8b0b661526fa9bc235bbf8a6b2691e0d345.tar.gz nixos-5b94c8b0b661526fa9bc235bbf8a6b2691e0d345.tar.bz2 nixos-5b94c8b0b661526fa9bc235bbf8a6b2691e0d345.tar.xz nixos-5b94c8b0b661526fa9bc235bbf8a6b2691e0d345.zip | |
udp2raw: ...
| -rw-r--r-- | overlays/udp2raw/package.nix | 2 | ||||
| -rw-r--r-- | overlays/udp2raw/udp2raw-makefile.patch | 15 |
2 files changed, 8 insertions, 9 deletions
diff --git a/overlays/udp2raw/package.nix b/overlays/udp2raw/package.nix index ba9cdb20..a50d87d4 100644 --- a/overlays/udp2raw/package.nix +++ b/overlays/udp2raw/package.nix | |||
| @@ -12,7 +12,7 @@ pkgsMusl.stdenv.mkDerivation rec { | |||
| 12 | patches = [ ./udp2raw-makefile.patch ]; | 12 | patches = [ ./udp2raw-makefile.patch ]; |
| 13 | configurePhase = ""; | 13 | configurePhase = ""; |
| 14 | buildPhase = '' | 14 | buildPhase = '' |
| 15 | make amd64 | 15 | make amd64_hw_aes |
| 16 | ''; | 16 | ''; |
| 17 | installPhase = '' | 17 | installPhase = '' |
| 18 | install -Dm755 udp2raw_amd64 $out/bin/udp2raw | 18 | install -Dm755 udp2raw_amd64 $out/bin/udp2raw |
diff --git a/overlays/udp2raw/udp2raw-makefile.patch b/overlays/udp2raw/udp2raw-makefile.patch index 80b39c6b..512c6f8e 100644 --- a/overlays/udp2raw/udp2raw-makefile.patch +++ b/overlays/udp2raw/udp2raw-makefile.patch | |||
| @@ -2,12 +2,11 @@ diff --git a/makefile b/makefile | |||
| 2 | index e758e68..16a3b23 100755 | 2 | index e758e68..16a3b23 100755 |
| 3 | --- a/makefile | 3 | --- a/makefile |
| 4 | +++ b/makefile | 4 | +++ b/makefile |
| 5 | @@ -53,7 +53,7 @@ mips24kc_le_asm_aes: git_version | 5 | @@ -53,6 +53,6 @@ mips24kc_le_asm_aes: git_version |
| 6 | #bcm2708: | ||
| 7 | # ${cc_bcm2708} -o ${NAME}_bcm2708 -I. ${SOURCES} ${FLAGS} -lrt -static -O3 | ||
| 8 | amd64:git_version | 6 | amd64:git_version |
| 9 | - ${cc_local} -o ${NAME}_$@ -I. ${SOURCES} ${FLAGS} -lrt -static -O3 | 7 | ${cc_amd64} -o ${NAME}_$@ -I. ${SOURCES} ${FLAGS} -lrt -static -O3 |
| 10 | + ${CXX} -o ${NAME}_$@ -I. ${SOURCES} ${FLAGS} -lrt -static -O3 | 8 | amd64_hw_aes:git_version |
| 11 | 9 | - ${cc_amd64} -o ${NAME}_$@ -I. ${SOURCES} ${FLAGS} -lrt -static -O0 -fno-omit-frame-pointer -g | |
| 12 | amd64_perf:git_version | 10 | + ${CXX} -o ${NAME}_$@ -I. ${SOURCES} ${FLAGS} -lrt -static -O0 -fno-omit-frame-pointer -g |
| 13 | ${cc_local} -o ${NAME}_$@ -I. ${SOURCES} ${FLAGS} -lrt -static -O0 -fno-omit-frame-pointer -g | 11 | x86:git_version |
| 12 | ${cc_x86} -o ${NAME}_$@ -I. ${SOURCES} ${FLAGS} -lrt -static -O2 -lgcc_eh -ggdb | ||