diff options
Diffstat (limited to 'pkgs/misc')
-rw-r--r-- | pkgs/misc/hdt/default.nix | 12 | ||||
-rw-r--r-- | pkgs/misc/stabber/default.nix | 5 |
2 files changed, 16 insertions, 1 deletions
diff --git a/pkgs/misc/hdt/default.nix b/pkgs/misc/hdt/default.nix index 9e1efd5f836d..e7c46d78588d 100644 --- a/pkgs/misc/hdt/default.nix +++ b/pkgs/misc/hdt/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, libtool, pkg-config, zlib, serd }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, libtool, pkg-config, zlib, serd }: stdenv.mkDerivation rec { pname = "hdt"; @@ -11,6 +11,16 @@ stdenv.mkDerivation rec { sha256 = "1vsq80jnix6cy78ayag7v8ajyw7h8dqyad1q6xkf2hzz3skvr34z"; }; + patches = [ + # Pull fix for gcc-13 compatibility pending upstream inclusion: + # https://github.com/rdfhdt/hdt-cpp/pull/276 + (fetchpatch { + name = "gcc-13.patch"; + url = "https://github.com/rdfhdt/hdt-cpp/commit/1b775835c6661c67cb18f5d6f65638ba7d4ecf3c.patch"; + hash = "sha256-2ppcA+Ztw5G/buW2cwCNbuGeUuvgvSruW3OarWNCIHI="; + }) + ]; + buildInputs = [ zlib serd ]; nativeBuildInputs = [ autoreconfHook libtool pkg-config ]; diff --git a/pkgs/misc/stabber/default.nix b/pkgs/misc/stabber/default.nix index ff89241a2469..7ec9a8985e1d 100644 --- a/pkgs/misc/stabber/default.nix +++ b/pkgs/misc/stabber/default.nix @@ -15,6 +15,11 @@ stdenv.mkDerivation { sha256 = "0042nbgagl4gcxa5fj7bikjdi1gbk0jwyqnzc5lswpb0l5y0i1ql"; }; + postPatch = '' + # New toolchainsd like gcc-13 trigger warnings and fail the build. + substituteInPlace configure.ac --replace "-Werror" "" + ''; + preAutoreconf = '' mkdir m4 ''; |