From 20d32bd9d23e7a0a66030c465fec2a4f56e3d998 Mon Sep 17 00:00:00 2001 From: "Christopher R. Nelson" Date: Sat, 19 Oct 2024 12:13:19 -0400 Subject: Add nerd-fonts package, delete patchelf (merged) --- crn/packages/elf.scm | 33 --------------------------------- crn/packages/fonts.scm | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 33 deletions(-) delete mode 100644 crn/packages/elf.scm create mode 100644 crn/packages/fonts.scm diff --git a/crn/packages/elf.scm b/crn/packages/elf.scm deleted file mode 100644 index b4ebe37..0000000 --- a/crn/packages/elf.scm +++ /dev/null @@ -1,33 +0,0 @@ -(define-module (crn packages elf) - #:use-module (guix gexp) - #:use-module (guix utils) - #:use-module (guix packages) - #:use-module (guix download) - #:use-module (gnu packages elf)) - -;; https://issues.guix.gnu.org/73541 by Hilton Chain -;; Newer patchelf may break binaries. e.g. When setting RUNPATH for a Go -;; program. -;; See also: https://github.com/NixOS/patchelf/issues/482 -(define-public patchelf-0.16 - (package - (inherit patchelf) - (name "patchelf") - (version "0.16.1") - (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/NixOS/patchelf/releases/download/" - version - "/patchelf-" version ".tar.bz2")) - (sha256 - (base32 - "0zdby3gpmm8q4735pviaq92zj41i2rdnhwhyrsb3sinc9hzmz4db")))) - (arguments - (substitute-keyword-arguments (package-arguments patchelf) - ((#:phases phases '%standard-phases) - #~(modify-phases #$phases - (add-after 'fix-tests 'skip-empty-rpath-test - (lambda _ - (substitute* "tests/set-empty-rpath.sh" - (("^\\$\\{SCRATCH\\}\\/simple.$") "")))))))))) diff --git a/crn/packages/fonts.scm b/crn/packages/fonts.scm new file mode 100644 index 0000000..cf2236f --- /dev/null +++ b/crn/packages/fonts.scm @@ -0,0 +1,40 @@ +(define-module (crn packages fonts) + #:use-module (guix gexp) + #:use-module (guix utils) + #:use-module (guix packages) + #:use-module (guix build-system font) + #:use-module (guix download) + #:use-module (guix git-download) + #:use-module ((guix licenses) #:prefix licenses:)) + +(define-public font-nerd-fonts + (package + (name "font-nerd-fonts") + (version "3.2.1") + (source (origin + (method url-fetch) + (uri (string-append + "https://github.com/ryanoasis/nerd-fonts/releases/download/v" + version + "/NerdFontsSymbolsOnly.tar.xz")) + (sha256 + (base32 + "0y4r1rid5sjd9ihi6nkwy0sja792aghg21bpl3ri029b9pifx8xp")))) + (build-system font-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'install 'make-files-writable + (lambda _ + (for-each + make-file-writable + (find-files "." ".*\\.(otf|otc|ttf|ttc)$")) + #t))))) + (home-page "https://www.nerdfonts.com/") + (synopsis "Iconic font aggregator, collection, and patcher") + (description + "Nerd Fonts patches developer targeted fonts with a high number +of glyphs (icons). Specifically to add a high number of extra glyphs +from popular ‘iconic fonts’ such as Font Awesome, Devicons, Octicons, +and others.") + (license licenses:expat))) -- cgit v1.2.3