From 16f39c944a4541aaf929b0155ed65826c4f330bb Mon Sep 17 00:00:00 2001 From: Ivan Polyakov Date: Fri, 7 Jan 2022 19:33:02 +0300 Subject: [PATCH] guix env --- config.mk | 9 +++++---- guix.scm | 24 ++++++++++++++++++++++++ manifest.scm | 11 +++++++++++ 3 files changed, 40 insertions(+), 4 deletions(-) create mode 100644 guix.scm create mode 100644 manifest.scm diff --git a/config.mk b/config.mk index 4c4c5d5..973e7c2 100644 --- a/config.mk +++ b/config.mk @@ -21,9 +21,10 @@ LIBS = -L$(X11LIB) -lm -lrt -lX11 -lutil -lXft \ `$(PKG_CONFIG) --libs freetype2` # flags -STCPPFLAGS = -DVERSION=\"$(VERSION)\" -D_XOPEN_SOURCE=600 -STCFLAGS = $(INCS) $(STCPPFLAGS) $(CPPFLAGS) $(CFLAGS) -STLDFLAGS = $(LIBS) $(LDFLAGS) +CFLAGS += -std=c99 +STCPPFLAGS = -DVERSION=\"$(VERSION)\" -D_XOPEN_SOURCE=600 +STCFLAGS = $(INCS) $(STCPPFLAGS) $(CPPFLAGS) $(CFLAGS) +STLDFLAGS = $(LIBS) $(LDFLAGS) # OpenBSD: #CPPFLAGS = -DVERSION=\"$(VERSION)\" -D_XOPEN_SOURCE=600 -D_BSD_SOURCE @@ -32,4 +33,4 @@ STLDFLAGS = $(LIBS) $(LDFLAGS) # `$(PKG_CONFIG) --libs freetype2` # compiler and linker -# CC = c99 +CC = gcc diff --git a/guix.scm b/guix.scm new file mode 100644 index 0000000..ccafce4 --- /dev/null +++ b/guix.scm @@ -0,0 +1,24 @@ +;;; st - simple terminal +;;; See LICENSE file for copyright and license details. + +(use-modules (guix packages) + (guix download) + (guix git-download) + (guix gexp) + (guix build-system gnu) + (gnu packages suckless)) + +(define %source-dir (dirname (current-filename))) + +(define vilor-st + (package + (inherit st) + (name "vilor-st") + (version "git") + (source (local-file %source-dir + #:recursive? #t + #:select? (git-predicate %source-dir))) + (home-page "https://notabug.org/vilor/st") + (synopsis "Patched and configured st 0.8.5"))) + +vilor-st diff --git a/manifest.scm b/manifest.scm new file mode 100644 index 0000000..deec587 --- /dev/null +++ b/manifest.scm @@ -0,0 +1,11 @@ +;;; st - simple terminal +;;; See LICENSE file for copyright and license details. + +(specifications->manifest + '("bash-minimal" + "coreutils" + "pkg-config" + "gcc-toolchain" + "libxft" + "libx11" + "make"))