gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pilot-link: 0.13.0-unstable-2022-09-26 -> 0.13.0-unstable-2026-04-25 (#519930)

Browse Source
This commit is contained in:
yaya
2026-05-18 11:09:56 +00:00
committed by GitHub
parent d44557224d 90ce7ec4bb
commit ea1fded5be
2 changed files with 3 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/by-name/pi/pilot-link/configure-checks.patch
-27
View File
@@ -1,27 +0,0 @@
--- pilot-link/configure.ac
+++ pilot-link/configure.ac
@@ -63,8 +63,8 @@
dnl Eat -Werror so configure will run properly, if the user provided it
enable_werror=no
save_CFLAGS="$CFLAGS"
-CFLAGS=$(echo $save_CFLAGS | sed -e s/-Werror//g)
-CXXFLAGS=$(echo $save_CXXFLAGS | sed -e s/-Werror//g)
+CFLAGS=$(echo "$save_CFLAGS" | sed -e 's/-Werror[^=]//g')
+CXXFLAGS=$(echo "$save_CXXFLAGS" | sed -e 's/-Werror[^=]//g')
if test "x$CFLAGS" != "x$save_CFLAGS"; then
dnl -Werror was set; treat it as implicit --enable-werror below
enable_werror="yes"
@@ -392,11 +392,8 @@
dnl Determine if system popt is good enough
save_LIBS="$LIBS"
AC_CHECK_HEADER(popt.h,
- AC_CHECK_DECL(POPT_BIT_SET,
- AC_CHECK_LIB(popt, poptStrippedArgv,,
- [with_included_popt="yes"]),
- [with_included_popt="yes"],
- [#include <popt.h>]),
+ AC_CHECK_LIB(popt, poptStrippedArgv,,
+ [with_included_popt="yes"]),
[with_included_popt="yes"]
)
LIBS="$save_LIBS"
pkgs/by-name/pi/pilot-link/package.nix
+3 -4
View File
@@ -19,20 +19,19 @@
stdenv.mkDerivation {
pname = "pilot-link";
version = "0.13.0-unstable-2022-09-26";
version = "0.13.0-unstable-2026-04-25";
src = fetchFromGitHub {
owner = "desrod";
repo = "pilot-link";
rev = "14338868111ce592c7ca7918a1f8a32ceecb7caf";
hash = "sha256-3b5T/QnRZawnjTgwvQKUbJTE/NiJ93eU2+qbRFuI13I";
rev = "fa3c832fb0aabd9465664309168abf278fd38f2a";
hash = "sha256-EZwE2iO1QZCzv5uVYTpUaHS9tIlBASs5W8i9f3QV4Ks=";
};
# Resolve build issues on modern systems.
# https://github.com/desrod/pilot-link/issues/16
# https://aur.archlinux.org/packages/pilot-link-git
patches = [
./configure-checks.patch
./incompatible-pointer-type.patch
]
++ lib.optionals enableConduits [ ./format-string-literals.patch ]