commit b316f2d0c6bde17e9e276ad63fb55682dd4abc89
parent 95c35620a132748d4955918fbb1b834d86af6a71
Author: Nikolay Korotkiy <sikmir@disroot.org>
Date: Sun, 5 Jan 2025 13:05:34 +0400
Up
Diffstat:
5 files changed, 8 insertions(+), 19 deletions(-)
diff --git a/pkgs/gemini/gplaces/default.nix b/pkgs/gemini/gplaces/default.nix
@@ -5,7 +5,6 @@
pkg-config,
curl,
openssl,
- memstreamHook,
}:
stdenv.mkDerivation (finalAttrs: {
@@ -25,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: {
buildInputs = [
curl
openssl
- ] ++ lib.optional stdenv.isDarwin memstreamHook;
+ ];
makeFlags = [ "VERSION=${finalAttrs.version}" ];
diff --git a/pkgs/gemini/tom/default.nix b/pkgs/gemini/tom/default.nix
@@ -5,7 +5,6 @@
pkg-config,
makeWrapper,
lua5_3,
- memstreamHook,
zlib,
}:
@@ -34,7 +33,7 @@ stdenv.mkDerivation {
buildInputs = [
lua5_3
zlib
- ] ++ lib.optional stdenv.isDarwin memstreamHook;
+ ];
installPhase = ''
install -Dm644 *.so *.lua -t $out/share/lua
diff --git a/pkgs/osm/smrender/default.nix b/pkgs/osm/smrender/default.nix
@@ -7,7 +7,6 @@
cairo,
librsvg,
darwin,
- memstreamHook,
testers,
}:
@@ -34,7 +33,6 @@ stdenv.mkDerivation (finalAttrs: {
]
++ lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.Foundation
- memstreamHook
];
passthru.tests.version = testers.testVersion {
diff --git a/pkgs/suckless/chibicc/default.nix b/pkgs/suckless/chibicc/default.nix
@@ -2,7 +2,6 @@
lib,
stdenv,
fetchFromGitHub,
- memstreamHook,
}:
stdenv.mkDerivation (finalAttrs: {
@@ -16,8 +15,6 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-sGSPQv9JPXTnyv+7CnmzWq1objCJRctK4wKII8GM26s=";
};
- buildInputs = lib.optional stdenv.isDarwin memstreamHook;
-
installPhase = ''
install -Dm755 chibicc -t $out/bin
'';
diff --git a/pkgs/suckless/farbfeld-utils/default.nix b/pkgs/suckless/farbfeld-utils/default.nix
@@ -7,7 +7,6 @@
SDL,
ghostscript,
sqlite,
- memstreamHook,
}:
stdenv.mkDerivation {
@@ -24,15 +23,12 @@ stdenv.mkDerivation {
rm ff-vccapture.c ff-xcapture.c ff-xdraw.c ff-xwin.c
'';
- buildInputs =
- [
- libGL
- SDL
- ghostscript
- sqlite
- ]
- ++ lib.optional stdenv.isLinux libX11
- ++ lib.optional stdenv.isDarwin memstreamHook;
+ buildInputs = [
+ libGL
+ SDL
+ ghostscript
+ sqlite
+ ] ++ lib.optional stdenv.isLinux libX11;
buildPhase = ''
runHook preBuild