From bc5fd40358eb13325c1f68c0e1f375f9cb147f9a Mon Sep 17 00:00:00 2001 From: Adminy Date: Sun, 30 Jul 2023 21:42:40 +0100 Subject: [PATCH 1/2] libgpiod: fix src hash --- pkgs/development/libraries/libgpiod/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libgpiod/default.nix b/pkgs/development/libraries/libgpiod/default.nix index a3cd7ea82d9e..cd3f4f48e08d 100644 --- a/pkgs/development/libraries/libgpiod/default.nix +++ b/pkgs/development/libraries/libgpiod/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/snapshot/libgpiod-${version}.tar.gz"; - sha256 = "sha256-M68o6YheNXZrDYu6u7pEvyPt2tXhTkVZD3Kv/AXYXA8="; + hash = "sha256-tu2lU1YWCo5zkG49SOlZ74EpZ4fXZJdbEPJX6WYGaOk="; }; patches = [ From 65047c0c0f7a685bf1c88854311a1a624064b642 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Tue, 1 Aug 2023 09:11:27 +0800 Subject: [PATCH 2/2] libgpiod: drop outdated patch --- ...LOC-and-_REALLOC-and-check-for-them-.patch | 31 ------------------- .../libraries/libgpiod/default.nix | 6 ---- 2 files changed, 37 deletions(-) delete mode 100644 pkgs/development/libraries/libgpiod/0001-Drop-AC_FUNC_MALLOC-and-_REALLOC-and-check-for-them-.patch diff --git a/pkgs/development/libraries/libgpiod/0001-Drop-AC_FUNC_MALLOC-and-_REALLOC-and-check-for-them-.patch b/pkgs/development/libraries/libgpiod/0001-Drop-AC_FUNC_MALLOC-and-_REALLOC-and-check-for-them-.patch deleted file mode 100644 index f2ee8e8d3d73..000000000000 --- a/pkgs/development/libraries/libgpiod/0001-Drop-AC_FUNC_MALLOC-and-_REALLOC-and-check-for-them-.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 2cc80dc06ea42087788cf27b31821ffa99a22f89 Mon Sep 17 00:00:00 2001 -From: Johannes Lode -Date: Thu, 14 Nov 2019 10:44:00 +0100 -Subject: [PATCH] Drop AC_FUNC_MALLOC and _REALLOC and check for them as - regular functions. - -While cross-compiling there occurred "undefined reference to -`rpl_malloc'", the suggested change fixes the problem. - -Tested for native X86_64 and armv7a-unknown-linux-gnueabihf. ---- - configure.ac | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 008499d..b492dc4 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -81,7 +81,8 @@ AC_DEFUN([HEADER_NOT_FOUND_CXX], - - # This is always checked (library needs this) - AC_HEADER_STDC --AC_FUNC_MALLOC -+# AC_FUNC_MALLOC -- does not work while cross-compiling -+AC_CHECK_FUNC([malloc realloc]) - AC_CHECK_FUNC([ioctl], [], [FUNC_NOT_FOUND_LIB([ioctl])]) - AC_CHECK_FUNC([asprintf], [], [FUNC_NOT_FOUND_LIB([asprintf])]) - AC_CHECK_FUNC([scandir], [], [FUNC_NOT_FOUND_LIB([scandir])]) --- -2.25.1 - diff --git a/pkgs/development/libraries/libgpiod/default.nix b/pkgs/development/libraries/libgpiod/default.nix index cd3f4f48e08d..4392d18752ef 100644 --- a/pkgs/development/libraries/libgpiod/default.nix +++ b/pkgs/development/libraries/libgpiod/default.nix @@ -11,12 +11,6 @@ stdenv.mkDerivation rec { hash = "sha256-tu2lU1YWCo5zkG49SOlZ74EpZ4fXZJdbEPJX6WYGaOk="; }; - patches = [ - # cross compiling fix - # https://github.com/brgl/libgpiod/pull/45 - ./0001-Drop-AC_FUNC_MALLOC-and-_REALLOC-and-check-for-them-.patch - ]; - buildInputs = [ kmod ] ++ lib.optionals enablePython [ python3 ncurses ]; nativeBuildInputs = [ autoconf-archive