diff options
| author | Nick Cao <nickcao@nichi.co> | 2023-07-31 20:30:14 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-31 20:30:14 -0600 |
| commit | 8767a672475c0041c5ad50076728979f6bf2f0b1 (patch) | |
| tree | b1ce886de7c64d0f1a0522eac773ffcddef6fc63 /pkgs | |
| parent | 3070ff8525861f22e83cdf2b7945e84930ba1a96 (diff) | |
| parent | 65047c0c0f7a685bf1c88854311a1a624064b642 (diff) | |
Merge pull request #246252 from adminy/patch-1
libgpiod 2.0.1 -> 2.0.1 change hash to the correct one
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/libgpiod/0001-Drop-AC_FUNC_MALLOC-and-_REALLOC-and-check-for-them-.patch | 31 | ||||
| -rw-r--r-- | pkgs/development/libraries/libgpiod/default.nix | 8 |
2 files changed, 1 insertions, 38 deletions
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 f2ee8e8d3d730..0000000000000 --- 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 <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 - diff --git a/pkgs/development/libraries/libgpiod/default.nix b/pkgs/development/libraries/libgpiod/default.nix index a3cd7ea82d9e0..4392d18752ef1 100644 --- a/pkgs/development/libraries/libgpiod/default.nix +++ b/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 |