yogsototh/doom-emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

fix(lib): doom-system-distro-version: check nixos-version first

Browse source 
Even if a NixOS machine has lsb_release in its PATH, lsb_release will be used
instead of nixos-version to determine the distro version.
This commit is contained in:
Peter Hoeg 2023-07-22 14:16:09 +00:00 committed by GitHub
parent 96ab62d566
commit 12dfc62ae5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lisp/lib/system.el
View file

@ -31,10 +31,10 @@
(format "Windows %s" "Unknown")) ; TODO
((eq distro 'macos)
(format "MacOS %s" (sh "sw_vers" "-productVersion")))
((executable-find "lsb_release")
(sh "lsb_release" "-s" "-d"))
((executable-find "nixos-version")
(format "NixOS %s" (sh "nixos-version")))
((executable-find "lsb_release")
(sh "lsb_release" "-s" "-d"))
((ignore-errors
(with-file-contents! "/etc/os-release"
(when (re-search-forward "^PRETTY_NAME=\"?\\([^\"\n]+\\)\"?" nil t)