From d4b30420812cd0b5ec97d6048e32903198b96f38 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Fri, 29 Dec 2023 21:58:30 +0100 Subject: Revert "..." This reverts commit b142c14d33cbf343574fd6d7d8056df53b695052. --- overlays/libdscp/default.nix | 6 ++---- overlays/libdscp/src/Makefile | 4 +--- 2 files changed, 3 insertions(+), 7 deletions(-) (limited to 'overlays/libdscp') 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 @@ { final, prev, ... }: { - libdscp = prev.stdenvNoCC.mkDerivation { + libdscp = prev.stdenv.mkDerivation { pname = "libdscp"; version = "0.0.0"; src = ./src; - nativeBuildInputs = with final; [ gcc musl.dev ]; - - makeFlags = [ "PREFIX=$(out)" "CC=musl-gcc" ]; + makeFlags = [ "PREFIX=$(out)" ]; }; 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 libdscp: $(CC) \ - -static \ -o $@.so $@.c \ -D_GNU_SOURCE \ - -nostartfiles -shared \ - -lm -lc + -nostartfiles -shared install: libdscp install -d $(DESTDIR)$(PREFIX)/lib/ install -m 644 libdscp.so $(DESTDIR)$(PREFIX)/lib/ -- cgit v1.2.3