From b1e619be4afa2dcf4fc4658305ff1fd0eed04094 Mon Sep 17 00:00:00 2001
From: Luke Boswell <lukewilliamboswell@gmail.com>
Date: Wed, 8 Jan 2025 16:16:22 +1100
Subject: [PATCH] fix nix flake

---
 flake.lock | 12 ++++++------
 flake.nix  | 18 +++++++++---------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/flake.lock b/flake.lock
index a9daebbed08..6481d198621 100644
--- a/flake.lock
+++ b/flake.lock
@@ -3,11 +3,11 @@
     "flake-compat": {
       "flake": false,
       "locked": {
-        "lastModified": 1732722421,
-        "narHash": "sha256-HRJ/18p+WoXpWJkcdsk9St5ZiukCqSDgbOGFa8Okehg=",
+        "lastModified": 1733328505,
+        "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
         "owner": "edolstra",
         "repo": "flake-compat",
-        "rev": "9ed2ac151eada2306ca8c418ebd97807bb08f6ac",
+        "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
         "type": "github"
       },
       "original": {
@@ -89,11 +89,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1732802692,
-        "narHash": "sha256-kFrxb45qj52TT/OFUFyTdmvXkn/KXDUL0/DOtjHEQvs=",
+        "lastModified": 1736303309,
+        "narHash": "sha256-IKrk7RL+Q/2NC6+Ql6dwwCNZI6T6JH2grTdJaVWHF0A=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "34971069ec33755b2adf2481851f66d8ec9a6bfa",
+        "rev": "a0b81d4fa349d9af1765b0f0b4a899c13776f706",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index c5927c9811b..8648f55a7ef 100644
--- a/flake.nix
+++ b/flake.nix
@@ -33,7 +33,7 @@
       lib = { buildRocPackage = import ./nix/buildRocPackage.nix; };
     in {
       inherit templates lib;
-    } // 
+    } //
     flake-utils.lib.eachSystem supportedSystems (system:
       let
 
@@ -49,7 +49,7 @@
 
         # DevInputs are not necessary to build roc as a user
         linuxDevInputs = with pkgs;
-          lib.optionals stdenv.isLinux [
+          pkgs.lib.optionals stdenv.isLinux [
             valgrind # used in cli tests, see cli/tests/cli_tests.rs
             vulkan-headers # here and below is all graphics stuff for examples/gui
             vulkan-loader
@@ -61,12 +61,12 @@
             xorg.libXi
             xorg.libxcb
             cargo-llvm-cov # to visualize code coverage
-            
+
           ];
 
         # DevInputs are not necessary to build roc as a user
         darwinDevInputs = with pkgs;
-          lib.optionals stdenv.isDarwin
+          pkgs.lib.optionals stdenv.isDarwin
             (with pkgs.darwin.apple_sdk.frameworks; [
               CoreVideo # for examples/gui
               Metal # for examples/gui
@@ -122,7 +122,7 @@
       in
       {
 
-        devShell = pkgs.mkShell {
+        devShells.default = pkgs.mkShell {
           buildInputs = sharedInputs ++ sharedDevInputs ++ darwinInputs ++ darwinDevInputs ++ linuxDevInputs
           ++ (if system == "x86_64-linux" then
             [ pkgs.nixgl.nixVulkanIntel ]
@@ -137,10 +137,10 @@
           NIX_GLIBC_PATH =
             if pkgs.stdenv.isLinux then "${pkgs.glibc.out}/lib" else "";
 
-          LD_LIBRARY_PATH = with pkgs;
-            lib.makeLibraryPath
-              ([ pkg-config stdenv.cc.cc.lib libffi ncurses zlib ]
-              ++ linuxDevInputs);
+          LD_LIBRARY_PATH = pkgs.lib.makeLibraryPath
+            ([ pkgs.pkg-config pkgs.stdenv.cc.cc.lib pkgs.libffi pkgs.ncurses pkgs.zlib ]
+            ++ linuxDevInputs);
+
           NIXPKGS_ALLOW_UNFREE =
             1; # to run the GUI examples with NVIDIA's closed source drivers