From cebf6fb82576f051484a4a0cdd694052fe6f922d Mon Sep 17 00:00:00 2001 From: Zhong Jianxin Date: Sun, 3 Nov 2024 20:34:32 +0800 Subject: [PATCH 1/2] steghide: Format using nixfmt-rfc-style --- pkgs/by-name/st/steghide/package.nix | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/pkgs/by-name/st/steghide/package.nix b/pkgs/by-name/st/steghide/package.nix index c62761bb2a21..71e98ac10ac0 100644 --- a/pkgs/by-name/st/steghide/package.nix +++ b/pkgs/by-name/st/steghide/package.nix @@ -1,11 +1,12 @@ -{ lib -, stdenv -, fetchFromGitHub -, autoreconfHook -, libjpeg -, libmcrypt -, libmhash -, zlib +{ + lib, + stdenv, + fetchFromGitHub, + autoreconfHook, + libjpeg, + libmcrypt, + libmhash, + zlib, }: stdenv.mkDerivation (finalAttrs: { @@ -24,10 +25,10 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - libjpeg - libmcrypt - libmhash - zlib + libjpeg + libmcrypt + libmhash + zlib ]; postPatch = '' From 38a1f61cded9f20b9f497be8960f8ad642ba4aac Mon Sep 17 00:00:00 2001 From: Zhong Jianxin Date: Sun, 3 Nov 2024 20:44:33 +0800 Subject: [PATCH 2/2] steghide: Fix build on clang 16 --- pkgs/by-name/st/steghide/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/st/steghide/package.nix b/pkgs/by-name/st/steghide/package.nix index 71e98ac10ac0..86cb3cfb4bb7 100644 --- a/pkgs/by-name/st/steghide/package.nix +++ b/pkgs/by-name/st/steghide/package.nix @@ -35,6 +35,11 @@ stdenv.mkDerivation (finalAttrs: { cd src ''; + # std::binary_function and std::unary_function has been removed in c++17 + makeFlags = lib.optionals stdenv.cc.isClang [ + "CXXFLAGS=-D_LIBCPP_ENABLE_CXX17_REMOVED_UNARY_BINARY_FUNCTION" + ]; + meta = with lib; { homepage = "https://github.com/museoa/steghide"; description = "Open source steganography program";