Merge pull request #246252 from adminy/patch-1

libgpiod 2.0.1 -> 2.0.1  change hash to the correct one

pkgs/development/libraries/libgpiod/0001-Drop-AC_FUNC_MALLOC-and-_REALLOC-and-check-for-them-.patch

@@ -1,31 +0,0 @@
-From 2cc80dc06ea42087788cf27b31821ffa99a22f89 Mon Sep 17 00:00:00 2001
-From: Johannes Lode <johannes.lode@dynainstruments.com>
-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
-

pkgs/development/libraries/libgpiod/default.nix

@@ -8,15 +8,9 @@ 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 = [
-    # 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