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

Merge pull request #24559 from georgewhewell/mtools-darwin

Browse Source 
mtools: fix build on darwin
This commit is contained in:
Daiderd Jordan 2017-04-05 00:40:09 +02:00 committed by GitHub
commit 2aeafc16c8
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/tools/filesystems/mtools/UNUSED-darwin.patch Normal file
View File

@ -0,0 +1,11 @@
--- mtools/sysincludes.h.orig 2017-04-01 20:59:46.083196540 +0100
+++ mtools/sysincludes.h 2017-04-01 20:59:12.855030456 +0100
@@ -103,7 +103,7 @@
# define PACKED __attribute__ ((packed))
# if __GNUC__ == 2 && __GNUC_MINOR__ > 6 || __GNUC__ >= 3
/* gcc 2.6.3 doesn't have "unused" */ /* mool */
-# define UNUSED(x) x __attribute__ ((unused));x
+# define UNUSED(x) x
# define UNUSEDP __attribute__ ((unused))
# else
# define UNUSED(x) x

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

@ -8,12 +8,19 @@ stdenv.mkDerivation rec {
sha256 = "119gdfnsxc6hzicnsf718k0fxgy2q14pxn7557rc96aki20czsar";
};
# Prevents errors such as "mainloop.c:89:15: error: expected ')'"
# Upstream issue https://lists.gnu.org/archive/html/info-mtools/2014-02/msg00000.html
patches = stdenv.lib.optional stdenv.isDarwin ./UNUSED-darwin.patch;
# fails to find X on darwin
configureFlags = stdenv.lib.optional stdenv.isDarwin "--without-x";
doCheck = true;
meta = {
homepage = http://www.gnu.org/software/mtools/;
description = "Utilities to access MS-DOS disks";
platforms = stdenv.lib.platforms.gnu; # arbitrary choice
platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.darwin;
maintainers = [ ];
};
}