From 76225dff4b38d6b4ab8248e75064e553d4c90b93 Mon Sep 17 00:00:00 2001 From: nek0 Date: Thu, 1 Dec 2022 16:23:43 +0100 Subject: [PATCH] more flakyness --- flake.nix | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/flake.nix b/flake.nix index 4ddf406..9f3818b 100644 --- a/flake.nix +++ b/flake.nix @@ -17,29 +17,30 @@ pkgs.haskell.lib.doJailbreak (pkg.overrideAttrs (_: { meta = { }; })); packageName = "affection"; - in { + in rec { packages.${packageName} = # (ref:haskell-package-def) - haskellPackages.callCabal2nix packageName self rec { + haskellPackages.callCabal2nixWithOptions packageName self "--flag examples" rec { # Dependency overrides go here }; defaultPackage = self.packages.${system}.${packageName}; - devShell = pkgs.mkShell { - buildInputs = with haskellPackages; [ - haskell-language-server - ghcid - cabal-install - ]; - nativeBuildInputs = with pkgs; [ - pkg-config - glib - SDL2 - freetype - glew - ]; - inputsFrom = builtins.attrValues self.packages.${system}; - }; + devShell = defaultPackage.env; + #devShell = pkgs.mkShell { + # buildInputs = with haskellPackages; [ + # haskell-language-server + # ghcid + # cabal-install + # ]; + # nativeBuildInputs = with pkgs; [ + # pkg-config + # glib + # SDL2 + # freetype + # glew + # ]; + # inputsFrom = builtins.attrValues self.packages.${system}; + #}; }); }