Merge pull request #243519 from cueaz/nnn-mime
nnn: fix file mime opts on darwin
This commit is contained in:
commit
f7907c1f09
|
@ -0,0 +1,15 @@
|
|||
diff --git a/src/nnn.c b/src/nnn.c
|
||||
index b3c0f986..c74e1ec9 100644
|
||||
--- a/src/nnn.c
|
||||
+++ b/src/nnn.c
|
||||
@@ -508,9 +508,7 @@ alignas(max_align_t) static char g_pipepath[TMP_LEN_MAX];
|
||||
static runstate g_state;
|
||||
|
||||
/* Options to identify file MIME */
|
||||
-#if defined(__APPLE__)
|
||||
-#define FILE_MIME_OPTS "-bIL"
|
||||
-#elif !defined(__sun) /* no MIME option for 'file' */
|
||||
+#if !defined(__sun) /* no MIME option for 'file' */
|
||||
#define FILE_MIME_OPTS "-biL"
|
||||
#endif
|
||||
|
|
@ -34,6 +34,10 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
};
|
||||
|
||||
patches = [
|
||||
# Nix-specific: ensure nnn passes correct arguments to the Nix file command on Darwin.
|
||||
# By default, nnn expects the macOS default file command, not the one provided by Nix.
|
||||
# However, both commands use different arguments to obtain the MIME type.
|
||||
./darwin-fix-file-mime-opts.patch
|
||||
# FIXME: remove for next release
|
||||
(fetchpatch {
|
||||
url = "https://github.com/jarun/nnn/commit/20e944f5e597239ed491c213a634eef3d5be735e.patch";
|
||||
|
|
Loading…
Reference in a new issue