movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-10 11:45:45 +03:00
Code Issues Projects Releases Packages Wiki Activity

pacparser: fix build on GCC 14

Browse source
This commit is contained in:
Petr Zahradnik 2025-04-27 15:02:17 +02:00
parent e61241410d
commit fa560bbd40
2 changed files with 24 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
pkgs/by-name/pa/pacparser/fix-invalid-pointer-type.patch Normal file
View file

@ -0,0 +1,11 @@
--- a/src/spidermonkey/js/src/jsapi.c
+++ b/src/spidermonkey/js/src/jsapi.c
@@ -93,7 +93,7 @@
#ifdef HAVE_VA_LIST_AS_ARRAY
#define JS_ADDRESSOF_VA_LIST(ap) ((va_list *)(ap))
#else
-#define JS_ADDRESSOF_VA_LIST(ap) (&(ap))
+#define JS_ADDRESSOF_VA_LIST(ap) ((va_list *)(&(ap)))
#endif
#if defined(JS_PARANOID_REQUEST) && defined(JS_THREADSAFE)

17
pkgs/by-name/pa/pacparser/package.nix
View file

@ -4,22 +4,31 @@
fetchFromGitHub, fetchFromGitHub,
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation (finalAttrs: {
pname = "pacparser"; pname = "pacparser";
version = "1.4.5"; version = "1.4.5";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "manugarg"; owner = "manugarg";
repo = "pacparser"; repo = "pacparser";
rev = "v${version}"; rev = "v${finalAttrs.version}";
sha256 = "sha256-X842+xPjM404aQJTc2JwqU4vq8kgyKhpnqVu70pNLks="; hash = "sha256-X842+xPjM404aQJTc2JwqU4vq8kgyKhpnqVu70pNLks=";
}; };
patches = [
# jsapi.c:96:35: error: passing argument 5 of 'TryArgumentFormatter' from incompatible pointer type []
# 96 | #define JS_ADDRESSOF_VA_LIST(ap) (&(ap))
# suggested by https://github.com/manugarg/pacparser/issues/194#issuecomment-2262030966
./fix-invalid-pointer-type.patch
];
makeFlags = [ makeFlags = [
"NO_INTERNET=1" "NO_INTERNET=1"
"PREFIX=${placeholder "out"}" "PREFIX=${placeholder "out"}"
]; ];
enableParallelBuilding = true;
preConfigure = '' preConfigure = ''
patchShebangs tests/runtests.sh patchShebangs tests/runtests.sh
cd src cd src
@ -35,4 +44,4 @@ stdenv.mkDerivation rec {
maintainers = with lib.maintainers; [ abbradar ]; maintainers = with lib.maintainers; [ abbradar ];
mainProgram = "pactester"; mainProgram = "pactester";
}; };
} })