git.iko.soy/typeable/nixpkgs
on master help sign in
mtools: fix darwin build
commit47a239a240a1362d5f637684c9181306e7fd8869 authorJörg Thalheim <joerg@thalheim.io> dateMon 19 Nov 2018, 10:19 (8 years ago) parent4f99f26
2 files changed+13−1
pkgs/tools/filesystems/mtools/default.nix+2−1 pkgs/tools/filesystems/mtools/fix-dos_to_wchar-declaration.patch+11
pkgs/tools/filesystems/mtools/default.nix+2−1
@@ -10,7 +10,8 @@ stdenv.mkDerivation rec {
1010
1111 # Prevents errors such as "mainloop.c:89:15: error: expected ')'"
1212 # Upstream issue https://lists.gnu.org/archive/html/info-mtools/2014-02/msg00000.html
13− patches = stdenv.lib.optional stdenv.isDarwin ./UNUSED-darwin.patch;
13+ patches = [ ./fix-dos_to_wchar-declaration.patch ] ++
14+ stdenv.lib.optional stdenv.isDarwin ./UNUSED-darwin.patch;
1415
1516 # fails to find X on darwin
1617 configureFlags = stdenv.lib.optional stdenv.isDarwin "--without-x";
pkgs/tools/filesystems/mtools/fix-dos_to_wchar-declaration.patchnew file+11
@@ -0,0 +1,11 @@
1+--- mtools-4.0.20.org/charsetConv.c 2018-11-19 10:16:14.183820865 +0000
2++++ mtools-4.0.20/charsetConv.c 2018-11-19 10:15:39.808451465 +0000
3+@@ -266,7 +266,7 @@
4+ free(cp);
5+ }
6+
7+-int dos_to_wchar(doscp_t *cp, char *dos, wchar_t *wchar, size_t len)
8++int dos_to_wchar(doscp_t *cp, const char *dos, wchar_t *wchar, size_t len)
9+ {
10+ int i;
11+