summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregor Kleen <gkleen@yggdrasil.li>2023-12-29 21:58:30 +0100
committerGregor Kleen <gkleen@yggdrasil.li>2023-12-29 21:58:30 +0100
commitd4b30420812cd0b5ec97d6048e32903198b96f38 (patch)
treef976718f4ef6e89eb44ee0c4610d0d4946c8b752
parent79ad4425c4606b9eb50341f1e44cb53aa7977ccc (diff)
downloadnixos-d4b30420812cd0b5ec97d6048e32903198b96f38.tar
nixos-d4b30420812cd0b5ec97d6048e32903198b96f38.tar.gz
nixos-d4b30420812cd0b5ec97d6048e32903198b96f38.tar.bz2
nixos-d4b30420812cd0b5ec97d6048e32903198b96f38.tar.xz
nixos-d4b30420812cd0b5ec97d6048e32903198b96f38.zip
Revert "..."
This reverts commit b142c14d33cbf343574fd6d7d8056df53b695052.
-rw-r--r--overlays/libdscp/default.nix6
-rw-r--r--overlays/libdscp/src/Makefile4
2 files changed, 3 insertions, 7 deletions
diff --git a/overlays/libdscp/default.nix b/overlays/libdscp/default.nix
index 46b622e9..9e82f20e 100644
--- a/overlays/libdscp/default.nix
+++ b/overlays/libdscp/default.nix
@@ -1,14 +1,12 @@
1{ final, prev, ... }: 1{ final, prev, ... }:
2{ 2{
3 libdscp = prev.stdenvNoCC.mkDerivation { 3 libdscp = prev.stdenv.mkDerivation {
4 pname = "libdscp"; 4 pname = "libdscp";
5 version = "0.0.0"; 5 version = "0.0.0";
6 6
7 src = ./src; 7 src = ./src;
8 8
9 nativeBuildInputs = with final; [ gcc musl.dev ]; 9 makeFlags = [ "PREFIX=$(out)" ];
10
11 makeFlags = [ "PREFIX=$(out)" "CC=musl-gcc" ];
12 }; 10 };
13 11
14 dscp = prev.writeShellApplication { 12 dscp = prev.writeShellApplication {
diff --git a/overlays/libdscp/src/Makefile b/overlays/libdscp/src/Makefile
index 00e3c92b..e76930d7 100644
--- a/overlays/libdscp/src/Makefile
+++ b/overlays/libdscp/src/Makefile
@@ -8,11 +8,9 @@ all: libdscp
8 8
9libdscp: 9libdscp:
10 $(CC) \ 10 $(CC) \
11 -static \
12 -o $@.so $@.c \ 11 -o $@.so $@.c \
13 -D_GNU_SOURCE \ 12 -D_GNU_SOURCE \
14 -nostartfiles -shared \ 13 -nostartfiles -shared
15 -lm -lc
16install: libdscp 14install: libdscp
17 install -d $(DESTDIR)$(PREFIX)/lib/ 15 install -d $(DESTDIR)$(PREFIX)/lib/
18 install -m 644 libdscp.so $(DESTDIR)$(PREFIX)/lib/ 16 install -m 644 libdscp.so $(DESTDIR)$(PREFIX)/lib/