diff options
| author | Vladimír Čunát <v@cunat.cz> | 2021-05-23 08:17:05 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2021-05-23 08:17:05 +0200 |
| commit | 29f57e475266edbb57d995c044aba3adf7f71298 (patch) | |
| tree | e1487a606bfa08638ca86b73c3775edd9310165b /pkgs/tools/filesystems | |
| parent | d6af82e69397c278cba1f05c5f70edb7de04a95e (diff) | |
| parent | c951b0e90c9633d5bf1b261784da3b7b295c2b4e (diff) | |
| download | nixpkgs-29f57e475266edbb57d995c044aba3adf7f71298.tar nixpkgs-29f57e475266edbb57d995c044aba3adf7f71298.tar.gz nixpkgs-29f57e475266edbb57d995c044aba3adf7f71298.tar.bz2 nixpkgs-29f57e475266edbb57d995c044aba3adf7f71298.tar.lz nixpkgs-29f57e475266edbb57d995c044aba3adf7f71298.tar.xz nixpkgs-29f57e475266edbb57d995c044aba3adf7f71298.tar.zst nixpkgs-29f57e475266edbb57d995c044aba3adf7f71298.zip | |
Merge #123133: curlftpfs: fix sandboxed builds on darwin
Diffstat (limited to 'pkgs/tools/filesystems')
| -rw-r--r-- | pkgs/tools/filesystems/curlftpfs/default.nix | 18 | ||||
| -rw-r--r-- | pkgs/tools/filesystems/curlftpfs/fix-rpl_malloc.patch | 13 |
2 files changed, 27 insertions, 4 deletions
diff --git a/pkgs/tools/filesystems/curlftpfs/default.nix b/pkgs/tools/filesystems/curlftpfs/default.nix index 2c5d886c14d..8c8fe31624f 100644 --- a/pkgs/tools/filesystems/curlftpfs/default.nix +++ b/pkgs/tools/filesystems/curlftpfs/default.nix @@ -1,11 +1,21 @@ { lib, stdenv, fetchurl, autoreconfHook, fuse, curl, pkg-config, glib, zlib }: -stdenv.mkDerivation { - name = "curlftpfs-0.9.2"; +stdenv.mkDerivation rec { + pname = "curlftpfs"; + version = "0.9.2"; + src = fetchurl { - url = "mirror://sourceforge/curlftpfs/curlftpfs-0.9.2.tar.gz"; + url = "mirror://sourceforge/curlftpfs/curlftpfs-${version}.tar.gz"; 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 ]; buildInputs = [ fuse curl glib zlib ]; @@ -24,7 +34,7 @@ stdenv.mkDerivation { meta = with lib; { description = "Filesystem for accessing FTP hosts based on FUSE and libcurl"; homepage = "http://curlftpfs.sourceforge.net"; - license = licenses.gpl2; + license = licenses.gpl2Only; platforms = platforms.unix; }; } diff --git a/pkgs/tools/filesystems/curlftpfs/fix-rpl_malloc.patch b/pkgs/tools/filesystems/curlftpfs/fix-rpl_malloc.patch new file mode 100644 index 00000000000..0265e1d8289 --- /dev/null +++ b/pkgs/tools/filesystems/curlftpfs/fix-rpl_malloc.patch @@ -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 |