foodogsquared/nixos-config
1
0
Fork 0
mirror of https://github.com/foo-dogsquared/nixos-config.git synced 2025-01-30 22:57:55 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

shells/guile: update with Guile 3 as default

Browse Source
This commit is contained in:
Gabriel Arazas 2023-09-26 22:54:12 +08:00
parent 02bcc27795
commit cc6b3cdcd0
No known key found for this signature in database
GPG Key ID: ADE0C41DAB221FCC
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
shells/default.nix
View File

@ -8,7 +8,7 @@ with pkgs; {
nix = callPackage ./nix.nix { }; nix = callPackage ./nix.nix { };
go = callPackage ./go.nix { }; go = callPackage ./go.nix { };
guile = callPackage ./guile.nix { }; guile = callPackage ./guile.nix { };
guile3 = callPackage ./guile.nix { guile = guile_3_0; }; guile2 = callPackage ./guile.nix { guile = guile_2_2; };
gtk3 = callPackage ./gtk.nix { gtk = gtk3; libportal-gtk = libportal-gtk3; }; gtk3 = callPackage ./gtk.nix { gtk = gtk3; libportal-gtk = libportal-gtk3; };
gtk4 = callPackage ./gtk.nix { gtk = gtk4; wrapGAppsHook = wrapGAppsHook4; libportal-gtk = libportal-gtk4; }; gtk4 = callPackage ./gtk.nix { gtk = gtk4; wrapGAppsHook = wrapGAppsHook4; libportal-gtk = libportal-gtk4; };
hugo = callPackage ./hugo.nix { }; hugo = callPackage ./hugo.nix { };

17
shells/guile.nix
View File

@ -1,5 +1,9 @@
{ mkShell { mkShell
, lib , lib
, gcc
, gettext
, pkg-config
, texinfo
, guile , guile
, guile-hall , guile-hall
}: }:
@ -10,17 +14,12 @@ in
mkShell { mkShell {
inherit guileVersion; inherit guileVersion;
packages = [ packages = [
gettext
guile guile
guile-hall guile-hall
pkg-config
texinfo
]; ];
# This is already properly exported through setup hooks but to make inputsFrom = [ gcc guile ];
# intentions clearer.
shellHook = ''
export GUILE_LOAD_PATH GUILE_LOAD_COMPILED_PATH
if test $guileVersion == "3.0"; then
export GUILE_EXTENSIONS_PATH
fi
'';
} }