Skip to content

Commit f24c533

Browse files
authored
Update nixpkgs to 23.05, improve direnv integration and flake devShell (#17217)
1 parent d79c0f0 commit f24c533

File tree

4 files changed

+19
-15
lines changed

4 files changed

+19
-15
lines changed

.envrc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,4 @@
1+
if ! has nix_direnv_version || ! nix_direnv_version 2.3.0; then
2+
source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/2.3.0/direnvrc" "sha256-Dmd+j63L84wuzgyjITIfSxSD57Tx7v51DMxVZOsiUD8="
3+
fi
14
use flake

flake.lock

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
{
2+
description = "Development environment for Space Station 14";
23

3-
inputs.nixpkgs.url = "github:NixOS/nixpkgs/release-22.11";
4+
inputs.nixpkgs.url = "github:NixOS/nixpkgs/release-23.05";
45
inputs.flake-utils.url = "github:numtide/flake-utils";
56

6-
outputs = { self, nixpkgs, flake-utils, ... }:
7-
flake-utils.lib.simpleFlake {
8-
inherit self nixpkgs;
9-
name = "space-station-14-devshell";
10-
shell = ./shell.nix;
11-
};
12-
7+
outputs = { self, nixpkgs, flake-utils }:
8+
flake-utils.lib.eachDefaultSystem (system: let
9+
pkgs = nixpkgs.legacyPackages.${system};
10+
in {
11+
devShells.default = import ./shell.nix { inherit pkgs; };
12+
});
1313
}

shell.nix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ let
77
SDL2
88
libGL
99
openal
10+
glibc
1011
freetype
1112
fluidsynth
1213
soundfont-fluid

0 commit comments

Comments
 (0)