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

Merge #123133: curlftpfs: fix sandboxed builds on darwin 

(cherry picked from commit 29f57e475266edbb57d995c044aba3adf7f71298)
This commit is contained in:
Vladimír Čunát 2021-05-23 08:17:05 +02:00
parent 11f5b3279d
commit ddc60bec55
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
2 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkgs/tools/filesystems/curlftpfs/default.nix
View File

@ -1,11 +1,21 @@
{ lib, stdenv, fetchurl, autoreconfHook, fuse, curl, pkg-config, glib, zlib }: { lib, stdenv, fetchurl, autoreconfHook, fuse, curl, pkg-config, glib, zlib }:
stdenv.mkDerivation { stdenv.mkDerivation rec {
name = "curlftpfs-0.9.2"; pname = "curlftpfs";
version = "0.9.2";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/curlftpfs/curlftpfs-0.9.2.tar.gz"; url = "mirror://sourceforge/curlftpfs/curlftpfs-${version}.tar.gz";
sha256 = "0n397hmv21jsr1j7zx3m21i7ryscdhkdsyqpvvns12q7qwwlgd2f"; sha256 = "0n397hmv21jsr1j7zx3m21i7ryscdhkdsyqpvvns12q7qwwlgd2f";
}; };
patches = [
# This removes AC_FUNC_MALLOC and AC_FUNC_REALLOC from configure.ac because
# it is known to cause problems. Search online for "rpl_malloc" and
# "rpl_realloc" to find out more.
./fix-rpl_malloc.patch
];
nativeBuildInputs = [ autoreconfHook pkg-config ]; nativeBuildInputs = [ autoreconfHook pkg-config ];
buildInputs = [ fuse curl glib zlib ]; buildInputs = [ fuse curl glib zlib ];
@ -24,7 +34,7 @@ stdenv.mkDerivation {
meta = with lib; { meta = with lib; {
description = "Filesystem for accessing FTP hosts based on FUSE and libcurl"; description = "Filesystem for accessing FTP hosts based on FUSE and libcurl";
homepage = "http://curlftpfs.sourceforge.net"; homepage = "http://curlftpfs.sourceforge.net";
license = licenses.gpl2; license = licenses.gpl2Only;
platforms = platforms.unix; platforms = platforms.unix;
}; };
} }

13
pkgs/tools/filesystems/curlftpfs/fix-rpl_malloc.patch Normal file
View File

@ -0,0 +1,13 @@
diff -Naur a/configure.ac b/configure.ac
--- a/configure.ac 2008-04-23 20:37:42.000000000 +0900
+++ b/configure.ac 2021-05-16 01:28:24.000000000 +0900
@@ -46,9 +46,7 @@
# Checks for library functions.
AC_FUNC_CHOWN
-AC_FUNC_MALLOC
AC_FUNC_MKTIME
-AC_FUNC_REALLOC
AC_FUNC_SELECT_ARGTYPES
AC_FUNC_STRFTIME
AC_FUNC_UTIME_NULL