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

Merge pull request #117132 from midchildan/feat/ntfs3g/darwin 

ntfs3g: add darwin build
This commit is contained in:
John Ericson 2021-03-21 14:44:44 -04:00 committed by GitHub
parent fcbf2d2896 75b0ef646e
commit 6a79a7af4f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pkgs/tools/filesystems/ntfs-3g/default.nix
View File

@ -1,5 +1,7 @@
{lib, stdenv, fetchurl, util-linux, libuuid { lib, stdenv, fetchurl, pkg-config, mount, libuuid
, crypto ? false, libgcrypt, gnutls, pkg-config}: , macfuse-stubs, DiskArbitration
, crypto ? false, libgcrypt, gnutls
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "ntfs3g"; pname = "ntfs3g";
@ -7,8 +9,9 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" "man" "doc" ]; outputs = [ "out" "dev" "man" "doc" ];
buildInputs = [ libuuid ] ++ lib.optionals crypto [ gnutls libgcrypt ]; buildInputs = [ libuuid ] ++ lib.optionals crypto [ gnutls libgcrypt ]
nativeBuildInputs = lib.optional crypto pkg-config; ++ lib.optionals stdenv.isDarwin [ macfuse-stubs DiskArbitration ];
nativeBuildInputs = [ pkg-config ];
src = fetchurl { src = fetchurl {
url = "https://tuxera.com/opensource/ntfs-3g_ntfsprogs-${version}.tgz"; url = "https://tuxera.com/opensource/ntfs-3g_ntfsprogs-${version}.tgz";
@ -19,8 +22,8 @@ stdenv.mkDerivation rec {
substituteInPlace src/Makefile.in --replace /sbin '@sbindir@' substituteInPlace src/Makefile.in --replace /sbin '@sbindir@'
substituteInPlace ntfsprogs/Makefile.in --replace /sbin '@sbindir@' substituteInPlace ntfsprogs/Makefile.in --replace /sbin '@sbindir@'
substituteInPlace libfuse-lite/mount_util.c \ substituteInPlace libfuse-lite/mount_util.c \
--replace /bin/mount ${util-linux}/bin/mount \ --replace /bin/mount ${mount}/bin/mount \
--replace /bin/umount ${util-linux}/bin/umount --replace /bin/umount ${mount}/bin/umount
''; '';
configureFlags = [ configureFlags = [
@ -43,7 +46,10 @@ stdenv.mkDerivation rec {
homepage = "https://www.tuxera.com/community/open-source-ntfs-3g/"; homepage = "https://www.tuxera.com/community/open-source-ntfs-3g/";
description = "FUSE-based NTFS driver with full write support"; description = "FUSE-based NTFS driver with full write support";
maintainers = with maintainers; [ dezgeg ]; maintainers = with maintainers; [ dezgeg ];
platforms = platforms.linux; platforms = with platforms; darwin ++ linux;
license = licenses.gpl2Plus; # and (lib)fuse-lite under LGPL2+ license = with licenses; [
gpl2Plus # ntfs-3g itself
lgpl2Plus # fuse-lite
];
}; };
} }

4
pkgs/top-level/all-packages.nix
View File

@ -6804,7 +6804,9 @@ in
nss_pam_ldapd = callPackage ../tools/networking/nss-pam-ldapd {}; nss_pam_ldapd = callPackage ../tools/networking/nss-pam-ldapd {};
ntfs3g = callPackage ../tools/filesystems/ntfs-3g { }; ntfs3g = callPackage ../tools/filesystems/ntfs-3g {
inherit (darwin.apple_sdk.frameworks) DiskArbitration;
};
# ntfsprogs are merged into ntfs-3g # ntfsprogs are merged into ntfs-3g
ntfsprogs = pkgs.ntfs3g; ntfsprogs = pkgs.ntfs3g;