From e3ee174b5320765247a7bfbc2f627228169764b5 Mon Sep 17 00:00:00 2001 From: user Date: Thu, 26 Dec 2024 02:49:11 +0300 Subject: [PATCH] Moved devShell to flake, comments in flake --- flake.nix | 21 +++++++++++++++++++++ shell.nix | 23 ----------------------- 2 files changed, 21 insertions(+), 23 deletions(-) delete mode 100644 shell.nix diff --git a/flake.nix b/flake.nix index bf07a17a..f467fcdb 100644 --- a/flake.nix +++ b/flake.nix @@ -33,9 +33,30 @@ }; in { + # Install the game on your own computer packages.x86_64-linux = { hl2 = pkgs.callPackage ./build.nix { inherit hl2-unwrapped; }; default = self.packages.x86_64-linux.hl2; }; + + # Build the game for others + devShells.default = pkgs.mkShell rec { + nativeBuildInputs = with pkgs; [ + makeWrapper + SDL2 + freetype + fontconfig + zlib + bzip2 + libjpeg + libpng + curl + openal + libopus + pkg-config + gcc + python3 + ]; + }; }; } diff --git a/shell.nix b/shell.nix deleted file mode 100644 index 4422a6c3..00000000 --- a/shell.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ pkgs ? import {} }: -pkgs.mkShell rec { - nativeBuildInputs = with pkgs; [ - makeWrapper - SDL2 - freetype - fontconfig - zlib - bzip2 - libjpeg - libpng - curl - openal - libopus - pkg-config - gcc - ]; - buildInputs = [ - (pkgs.python3.withPackages (ps: with ps; [ - ipython - ])) - ]; -}