mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-02-07 20:53:22 +00:00
dash: 0.5.11.2 -> 0.5.11.4
The readdir64/dirent64 patch was obsoleted by an upstream commit.
This commit is contained in:
parent
d9d051ecd9
commit
1875c0312e
@ -1,41 +0,0 @@
|
|||||||
From 7e75779eaeacdbb46a387a59d9aaf1481a1da3e5 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Adrian Gierakowski <agierakowski@gmail.com>
|
|
||||||
Date: Sun, 19 Jul 2020 08:38:05 +0100
|
|
||||||
Subject: [PATCH] fix dirent64 et al on darwin
|
|
||||||
|
|
||||||
---
|
|
||||||
configure.ac | 11 +++++++++++
|
|
||||||
1 file changed, 11 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/configure.ac b/configure.ac
|
|
||||||
index b8faca9..cee1e4d 100644
|
|
||||||
--- a/configure.ac
|
|
||||||
+++ b/configure.ac
|
|
||||||
@@ -139,6 +139,7 @@ if test "$ac_cv_func_signal" != yes; then
|
|
||||||
[klibc has bsd_signal instead of signal])])
|
|
||||||
fi
|
|
||||||
|
|
||||||
+dnl TODO: stat64 is deprecated since macOS 10.6
|
|
||||||
dnl Check for stat64 (dietlibc/klibc).
|
|
||||||
AC_CHECK_FUNC(stat64,, [
|
|
||||||
AC_DEFINE(fstat64, fstat, [64-bit operations are the same as 32-bit])
|
|
||||||
@@ -155,6 +156,16 @@ AC_CHECK_FUNC(open64,, [
|
|
||||||
AC_DEFINE(open64, open, [64-bit operations are the same as 32-bit])
|
|
||||||
])
|
|
||||||
|
|
||||||
+dnl OS X apparently has stat64 but not readdir64.
|
|
||||||
+AC_CHECK_FUNC(readdir64,, [
|
|
||||||
+ AC_DEFINE(readdir64, readdir, [64-bit operations are the same as 32-bit])
|
|
||||||
+])
|
|
||||||
+
|
|
||||||
+dnl OS X apparently has stat64 but not dirent64.
|
|
||||||
+AC_CHECK_TYPE(struct dirent64,, [
|
|
||||||
+ AC_DEFINE(dirent64, dirent, [64-bit operations are the same as 32-bit])
|
|
||||||
+],[#include <dirent.h>])
|
|
||||||
+
|
|
||||||
dnl Check if struct stat has st_mtim.
|
|
||||||
AC_MSG_CHECKING(for stat::st_mtim)
|
|
||||||
AC_COMPILE_IFELSE(
|
|
||||||
--
|
|
||||||
2.15.1
|
|
||||||
|
|
@ -9,11 +9,11 @@
|
|||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "dash";
|
pname = "dash";
|
||||||
version = "0.5.11.2";
|
version = "0.5.11.4";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "http://gondor.apana.org.au/~herbert/dash/files/${pname}-${version}.tar.gz";
|
url = "http://gondor.apana.org.au/~herbert/dash/files/${pname}-${version}.tar.gz";
|
||||||
sha256 = "0pvdpm1cgfbc25ramn4305a0158yq031q1ain4dc972rnxl7vyq0";
|
sha256 = "13g06zqfy4n7jkrbb5l1vw0xcnjvq76i16al8fjc5g33afxbf5af";
|
||||||
};
|
};
|
||||||
|
|
||||||
hardeningDisable = [ "format" ];
|
hardeningDisable = [ "format" ];
|
||||||
@ -25,13 +25,9 @@ stdenv.mkDerivation rec {
|
|||||||
url = "https://git.kernel.org/pub/scm/utils/dash/dash.git/patch/?id=29d6f2148f10213de4e904d515e792d2cf8c968e";
|
url = "https://git.kernel.org/pub/scm/utils/dash/dash.git/patch/?id=29d6f2148f10213de4e904d515e792d2cf8c968e";
|
||||||
sha256 = "0aadb7aaaan6jxmi6icv4p5gqx7k510yszaqsa29b5giyxz5l9i1";
|
sha256 = "0aadb7aaaan6jxmi6icv4p5gqx7k510yszaqsa29b5giyxz5l9i1";
|
||||||
})
|
})
|
||||||
] ++ lib.optionals stdenv.isDarwin [
|
|
||||||
# Temporary fix until a proper one is accepted upstream
|
|
||||||
./0001-fix-dirent64-et-al-on-darwin.patch
|
|
||||||
];
|
];
|
||||||
|
|
||||||
depsBuildBuild = [ buildPackages.stdenv.cc ];
|
depsBuildBuild = [ buildPackages.stdenv.cc ];
|
||||||
nativeBuildInputs = lib.optional stdenv.isDarwin autoreconfHook;
|
|
||||||
buildInputs = [ libedit ];
|
buildInputs = [ libedit ];
|
||||||
|
|
||||||
configureFlags = [ "--with-libedit" ];
|
configureFlags = [ "--with-libedit" ];
|
||||||
|
Loading…
Reference in New Issue
Block a user