diff --git a/pkgs/by-name/li/liboprf/no-static.patch b/pkgs/by-name/li/liboprf/no-static.patch index 7fd8afdefcd8..99928ed7a3d6 100644 --- a/pkgs/by-name/li/liboprf/no-static.patch +++ b/pkgs/by-name/li/liboprf/no-static.patch @@ -1,12 +1,13 @@ diff --git a/makefile b/makefile -index 444feae..0b2d482 100644 +index ce33665..d85152e 100644 --- a/makefile +++ b/makefile -@@ -134,8 +134,12 @@ clean: +@@ -148,9 +148,12 @@ clean: install: install-oprf install-noiseXK -install-oprf: $(DESTDIR)$(PREFIX)/lib/liboprf.$(SOEXT) \ +- $(DESTDIR)$(PREFIX)/$(DEBUGDIR)/liboprf.$(SOEXT).debug \ - $(DESTDIR)$(PREFIX)/lib/liboprf.$(STATICEXT) \ +INSTALL_EXT=$(STATICEXT) +ifeq ($(findstring -shared,$(LDFLAGS)),) diff --git a/pkgs/by-name/li/liboprf/package.nix b/pkgs/by-name/li/liboprf/package.nix index 77a71b083359..7e2315f35508 100644 --- a/pkgs/by-name/li/liboprf/package.nix +++ b/pkgs/by-name/li/liboprf/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "liboprf"; - version = "0.9.2"; + version = "0.9.3"; src = fetchFromGitHub { owner = "stef"; repo = "liboprf"; tag = "v${finalAttrs.version}"; - hash = "sha256-Toja0rR0321i7L1dsB9YxrwNJwKUzuSfK5LLR3tex7U="; + hash = "sha256-BH7sLkj7vGtz2kSSuV2+BrwlQJ26s4UTlNL/owJhzCk="; }; sourceRoot = "${finalAttrs.src.name}/src"; @@ -24,6 +24,12 @@ stdenv.mkDerivation (finalAttrs: { ./no-static.patch ]; + # strip: error: option is not supported for MachO + postPatch = lib.optionalString stdenv.hostPlatform.isMacho '' + substituteInPlace makefile \ + --replace-fail "--strip-unneeded" "" + ''; + strictDeps = true; nativeBuildInputs = [ pkgconf ];