Update nixpkgs to 23.05, improve direnv integration and flake devShel…

…l (#17217)
Simple-Station · Jun 8, 2023 · f24c533 · f24c533
1 parent d79c0f0
commit f24c533
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 15 deletions.
diff --git a/.envrc b/.envrc
@@ -1 +1,4 @@
+if ! has nix_direnv_version || ! nix_direnv_version 2.3.0; then
+    source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/2.3.0/direnvrc" "sha256-Dmd+j63L84wuzgyjITIfSxSD57Tx7v51DMxVZOsiUD8="
+fi
 use flake
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -1,13 +1,13 @@
 {
+  description = "Development environment for Space Station 14";
 
-  inputs.nixpkgs.url = "github:NixOS/nixpkgs/release-22.11";
+  inputs.nixpkgs.url = "github:NixOS/nixpkgs/release-23.05";
   inputs.flake-utils.url = "github:numtide/flake-utils";
 
-  outputs = { self, nixpkgs, flake-utils, ... }:
-    flake-utils.lib.simpleFlake {
-      inherit self nixpkgs;
-      name = "space-station-14-devshell";
-      shell = ./shell.nix;
-    };
-
+  outputs = { self, nixpkgs, flake-utils }:
+    flake-utils.lib.eachDefaultSystem (system: let
+      pkgs = nixpkgs.legacyPackages.${system};
+    in {
+      devShells.default = import ./shell.nix { inherit pkgs; };
+    });
 }
diff --git a/shell.nix b/shell.nix
@@ -7,6 +7,7 @@ let
     SDL2
     libGL
     openal
+    glibc
     freetype
     fluidsynth
     soundfont-fluid
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,6 +7,7 @@ let @@
         SDL2
         libGL
         openal
+        glibc
         freetype
         fluidsynth
         soundfont-fluid
@@ Expand Down @@