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

Merge pull request #50681 from r-ryantm/auto-update/mtools

Browse Source 
mtools: 4.0.19 -> 4.0.20
This commit is contained in:
Jörg Thalheim 2018-11-19 10:24:46 +00:00 committed by GitHub
commit 350aea8932
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/tools/filesystems/mtools/default.nix
View File

@ -1,16 +1,17 @@
{ stdenv, fetchurl }: { stdenv, fetchurl }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "mtools-4.0.19"; name = "mtools-4.0.20";
src = fetchurl { src = fetchurl {
url = "mirror://gnu/mtools/${name}.tar.bz2"; url = "mirror://gnu/mtools/${name}.tar.bz2";
sha256 = "1pqhv5l4fqj1d3698vajkccz65xqxs3991wpylbw7hm1kqcrgh8v"; sha256 = "1vcahr9s6zv1hnrx2bgjnzcas2y951q90r1jvvv4q9v5kwfd6qb0";
}; };
# Prevents errors such as "mainloop.c:89:15: error: expected ')'" # Prevents errors such as "mainloop.c:89:15: error: expected ')'"
# Upstream issue https://lists.gnu.org/archive/html/info-mtools/2014-02/msg00000.html # Upstream issue https://lists.gnu.org/archive/html/info-mtools/2014-02/msg00000.html
patches = stdenv.lib.optional stdenv.isDarwin ./UNUSED-darwin.patch; patches = [ ./fix-dos_to_wchar-declaration.patch ] ++
stdenv.lib.optional stdenv.isDarwin ./UNUSED-darwin.patch;
# fails to find X on darwin # fails to find X on darwin
configureFlags = stdenv.lib.optional stdenv.isDarwin "--without-x"; configureFlags = stdenv.lib.optional stdenv.isDarwin "--without-x";

11
pkgs/tools/filesystems/mtools/fix-dos_to_wchar-declaration.patch Normal file
View File

@ -0,0 +1,11 @@
--- mtools-4.0.20.org/charsetConv.c 2018-11-19 10:16:14.183820865 +0000
+++ mtools-4.0.20/charsetConv.c 2018-11-19 10:15:39.808451465 +0000
@@ -266,7 +266,7 @@
free(cp);
}
-int dos_to_wchar(doscp_t *cp, char *dos, wchar_t *wchar, size_t len)
+int dos_to_wchar(doscp_t *cp, const char *dos, wchar_t *wchar, size_t len)
{
int i;