This commit is contained in:
Matt Nish-Lapidus 2024-10-16 14:22:52 -04:00
parent 3fecf46f63
commit 9ed3fa6690
2 changed files with 46 additions and 8 deletions

View file

@ -1,9 +1,31 @@
;; The following lines added by ql:add-to-init-file:
;;; The following lines added by ql:add-to-init-file:
#-quicklisp #-quicklisp
(let ((quicklisp-init (merge-pathnames "~/.quicklisp/setup.lisp" #+asdf (require :asdf)
(let ((quicklisp-init (merge-pathnames "quicklisp/setup.lisp"
(user-homedir-pathname)))) (user-homedir-pathname))))
(when (probe-file quicklisp-init) (when (probe-file quicklisp-init)
(load quicklisp-init))) (load quicklisp-init)))
(push (pathname "~/source/_cl/") ql:*local-project-directories*) (push (pathname "~/source/_cl/") ql:*local-project-directories*)
(ql:quickload :cffi :silent t)
(pushnew (merge-pathnames ".nix-profile/lib/" (user-homedir-pathname))
cffi:*foreign-library-directories*)
(pushnew (merge-pathnames ".nix-profile/lib64/" (user-homedir-pathname))
cffi:*foreign-library-directories*)
(defun pkg-config-add-lib (libname)
(let ((process (sb-ext:run-program "/usr/bin/env"
(list "pkg-config" libname "--libs-only-L")
:input t :output :stream :wait t)))
(let ((stream (sb-ext:process-output process)))
(loop for line = (read-line stream nil nil)
while line do
;; Drop "-L" part, and add '/' to the end. '/' IS necessary!
(pushnew (pathname (concatenate 'string (subseq line 2) "/"))
cffi:*foreign-library-directories*))
(sb-ext:process-close process))))
;; load specific libs
(pkg-config-add-lib "libffi")

View file

@ -70,6 +70,8 @@
ruff ruff
python311Packages.pip python311Packages.pip
sbcl sbcl
sbclPackages.cffi
libffi.dev
nodejs_18 nodejs_18
platformio-core platformio-core
kanata-with-cmd kanata-with-cmd
@ -80,7 +82,7 @@
pkg-config pkg-config
ftgl ftgl
gperf gperf
numbat
expat expat
# node packages # node packages
@ -96,6 +98,8 @@
nixd nixd
# bottles-unwrapped
fishPlugins.foreign-env fishPlugins.foreign-env
fishPlugins.z fishPlugins.z
fishPlugins.fzf fishPlugins.fzf
@ -115,6 +119,7 @@
gnomeExtensions.paperwm gnomeExtensions.paperwm
gnomeExtensions.tiling-shell gnomeExtensions.tiling-shell
gnomeExtensions.another-window-session-manager gnomeExtensions.another-window-session-manager
gnomeExtensions.media-controls
gnome-software gnome-software
gnome-tweaks gnome-tweaks
gnome-photos gnome-photos
@ -209,7 +214,6 @@
helm helm
surge surge
odin2 odin2
tunefish
calf calf
# Fonts # Fonts
@ -234,6 +238,7 @@
sessionVariables = { sessionVariables = {
EDITOR = "emacsclient -r"; EDITOR = "emacsclient -r";
WINEFSYNC = 1; WINEFSYNC = 1;
PKG_CONFIG_PATH = "/home/emenel/.nix-profile/lib/pkgconfig:/home/emenel/.nix-profile/lib64/pkgconfig:/home/emenal/.nix-profile/share/pkgconfig";
}; };
stateVersion = "24.05"; stateVersion = "24.05";
@ -268,6 +273,7 @@
extraPackages = epkgs: [ extraPackages = epkgs: [
epkgs.mu4e epkgs.mu4e
epkgs.vterm epkgs.vterm
epkgs.sly-quicklisp
]; ];
}; };
ripgrep = { ripgrep = {
@ -342,9 +348,19 @@
}; };
nixpkgs.config.packageOverrides = pkgs: { nixpkgs.config.packageOverrides = pkgs: {
renoise = pkgs.renoise.override { # renoise = pkgs.renoise.override {
releasePath = /home/emenel/temp/rns_344_linux_x86_64.tar.gz; # releasePath = /home/emenel/temp/rns_344_linux_x86_64.tar.gz;
# };
raylib = pkgs.raylib.overrideDerivation (previous: {
name = "raylib-head";
src = pkgs.fetchFromGitHub {
owner = "raysan5";
repo = "raylib";
hash = "sha256-PHYdAEhittShd1UhASdhmq0nGHEEVZEUGcjCUUJZl9g=";
rev = "c9c830cb971d7aa744fe3c7444b768ccd5176c4c";
}; };
patches = [""];
});
}; };
services = { services = {