From ba24c0b31c2b0c5806909f3c982802a3b11c7586 Mon Sep 17 00:00:00 2001
From: solomon <ssbothwell@gmail.com>
Date: Mon, 22 Aug 2022 20:33:18 -0700
Subject: Updates nix flake for local development

---
 .envrc     |  2 ++
 .gitignore |  2 ++
 flake.nix  | 21 +++++++++++++++------
 3 files changed, 19 insertions(+), 6 deletions(-)
 create mode 100644 .envrc

diff --git a/.envrc b/.envrc
new file mode 100644
index 0000000..988cfa6
--- /dev/null
+++ b/.envrc
@@ -0,0 +1,2 @@
+# this line sources your `.envrc.local` file
+source_env_if_exists .envrc.local
diff --git a/.gitignore b/.gitignore
index 849bc39..c7b664a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,3 +22,5 @@ tags
 /stack.yaml.lock
 /.dir-locals.el
 /doc/web/changelog.html
+/.direnv/
+/.envrc.local
diff --git a/flake.nix b/flake.nix
index 0c79fad..7471fb9 100644
--- a/flake.nix
+++ b/flake.nix
@@ -9,25 +9,34 @@
         haskellPackages = prev.haskellPackages.override (old: {
           overrides = prev.lib.composeExtensions (old.overrides or (_: _: { }))
             (hself: hsuper: {
-              xmobar = hself.callCabal2nix "xmobar"
-                (git-ignore-nix.lib.gitignoreSource ./.) { };
+              xmobar = prev.haskell.lib.compose.dontCheck (hself.callCabal2nix "xmobar"
+                (git-ignore-nix.lib.gitignoreSource ./.) { });
             });
         });
       };
       overlays = [ overlay ];
     in flake-utils.lib.eachDefaultSystem (system:
       let pkgs = import nixpkgs { inherit system overlays; };
-      in rec {
-        devShell = pkgs.haskellPackages.shellFor {
-          packages = p: [ p.xmobar ];
-          buildInputs = with pkgs; [
+          dynamicLibraries = with pkgs; [
             xorg.libX11
             xorg.libXrandr
             xorg.libXrender
             xorg.libXScrnSaver
             xorg.libXext
             xorg.libXft
+            xorg.libXpm.out
+            xorg.libXrandr
+            xorg.libXrender
           ];
+      in rec {
+        devShell = pkgs.haskellPackages.shellFor {
+          packages = p: [ p.xmobar ];
+          buildInputs = with pkgs; [
+            haskellPackages.cabal-install
+            #haskellPackages.haskell-language-server
+          ] ++ dynamicLibraries;
+
+          LD_LIBRARY_PATH = pkgs.lib.strings.makeLibraryPath dynamicLibraries;
         };
         defaultPackage = pkgs.haskellPackages.xmobar;
       }) // {
-- 
cgit v1.2.3