merge development into master

1 files changed, 1 insertions, 31 deletions

diff --git a/flake.nix b/flake.nix
index 90a80c5..fa7666c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -7,41 +7,11 @@
     self,
     ...
   }: let
-    versionString = "0.3.0";
-    package = {
-      mkDerivation,
-      base,
-      bytestring,
-      GLFW-b,
-      lens,
-      lib,
-      linear,
-      OpenGL,
-    }:
-      mkDerivation {
-        pname = "hs-game";
-        version = versionString;
-        src = ./.;
-        isLibrary = false;
-        isExecutable = true;
-        executableHaskellDepends = [
-          base
-          bytestring
-          GLFW-b
-          lens
-          linear
-          OpenGL
-        ];
-        homepage = "https://git.mtgmonkey.net/Andromeda/hs-game";
-        license = lib.licenses.bsd3;
-        mainProgram = "hs-game";
-      };
     system = "x86_64-linux";
     pkgs = nixpkgs.legacyPackages.${system};
   in {
     packages.${system} = {
-      default =
-        pkgs.haskellPackages.callPackage package {};
+      default = pkgs.haskellPackages.callCabal2nix "hs-game" ./. {};
     };
     devShells.${system} = {
       default = pkgs.mkShell {