Move shells to separate folder

arunoruto · Nov 5, 2024 · 9875c05 · 9875c05
1 parent d71d37d
commit 9875c05
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 34 deletions.
diff --git a/flake.nix b/flake.nix
@@ -182,6 +182,8 @@
             }
           );
 
+      overlays = import ./overlays { inherit inputs; };
+      devShells.${system} = import ./shells nixpkgs.legacyPackages.${system};
       packages.${system} = import ./pkgs nixpkgs.legacyPackages.${system};
       # packages.${system} = (
       #   let
@@ -193,39 +195,5 @@
       #   in
       #   import ./pkgs { inherit pkgs; }
       # );
-      overlays = import ./overlays { inherit inputs; };
-
-      devShells.${system}.default =
-        let
-          pkgs = nixpkgs.legacyPackages.${system};
-        in
-        pkgs.mkShell {
-          buildInputs = with pkgs; [
-            cmake
-            glib
-            stdenv.cc.cc.lib
-            zlib
-          ];
-
-          shellHook = ''
-            # export LD_LIBRARY_PATH=${
-              pkgs.lib.makeLibraryPath [
-                pkgs.glib
-                pkgs.stdenv.cc.cc.lib
-                pkgs.zlib
-              ]
-            }:''$LD_LIBRARY_PATH
-            export LD_LIBRARY_PATH=${
-              pkgs.lib.makeLibraryPath [
-                pkgs.glib
-                pkgs.stdenv.cc.cc.lib
-                pkgs.zlib
-              ]
-            }
-            # https://github.com/python-poetry/poetry/issues/8623#issuecomment-1793624371
-            export PYTHON_KEYRING_BACKEND=keyring.backends.null.Keyring
-            echo "Flake Env"
-          '';
-        };
     };
 }
diff --git a/shells/default.nix b/shells/default.nix
@@ -0,0 +1,31 @@
+pkgs: {
+  # default = pkgs.callPackage ./csm/package.nix { };
+  default = pkgs.mkShell {
+    buildInputs = with pkgs; [
+      cmake
+      glib
+      stdenv.cc.cc.lib
+      zlib
+    ];
+
+    shellHook = ''
+      # export LD_LIBRARY_PATH=${
+        pkgs.lib.makeLibraryPath [
+          pkgs.glib
+          pkgs.stdenv.cc.cc.lib
+          pkgs.zlib
+        ]
+      }:''$LD_LIBRARY_PATH
+      export LD_LIBRARY_PATH=${
+        pkgs.lib.makeLibraryPath [
+          pkgs.glib
+          pkgs.stdenv.cc.cc.lib
+          pkgs.zlib
+        ]
+      }
+      # https://github.com/python-poetry/poetry/issues/8623#issuecomment-1793624371
+      export PYTHON_KEYRING_BACKEND=keyring.backends.null.Keyring
+      echo "Flake Env"
+    '';
+  };
+}