emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[nongnu] elpa/nix-mode e4844f7a71 438/500: Fix nix-system in nix-2.4


From: ELPA Syncer
Subject: [nongnu] elpa/nix-mode e4844f7a71 438/500: Fix nix-system in nix-2.4
Date: Sat, 29 Jan 2022 08:27:54 -0500 (EST)

branch: elpa/nix-mode
commit e4844f7a711c8d7dceb82b6b841a1e8485e12586
Author: Matthew Bauer <mjbauer95@gmail.com>
Commit: Matthew Bauer <mjbauer95@gmail.com>

    Fix nix-system in nix-2.4
---
 nix.el | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/nix.el b/nix.el
index 2ea7d09b9b..35735abaef 100644
--- a/nix.el
+++ b/nix.el
@@ -61,7 +61,9 @@
 (defun nix-system ()
   "Get the current system tuple."
   (with-temp-buffer
-    (call-process nix-executable nil (list t nil) nil "eval" "--raw" 
"(builtins.currentSystem)")
+    (if (nix-is-24)
+       (call-process nix-executable nil (list t nil) nil "eval" "--impure" 
"--raw" "--expr" "(builtins.currentSystem)")
+      (call-process nix-executable nil (list t nil) nil "eval" "--raw" 
"(builtins.currentSystem)"))
     (buffer-string)))
 
 (defvar nix-version nil)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]