aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAkshay Nair <phenax5@gmail.com>2024-12-21 22:45:59 +0530
committerAkshay Nair <phenax5@gmail.com>2024-12-21 22:49:12 +0530
commit6d6cd036106e5daa2aef12bfcb2968657f9841b0 (patch)
tree7a9c223d7b66e5295bb67f2cbcbaf74f2c0d0dba
parentf51fbc728e4b731372e39ba19c38a35ef58fe71a (diff)
downloadchelleport-6d6cd036106e5daa2aef12bfcb2968657f9841b0.tar.gz
chelleport-6d6cd036106e5daa2aef12bfcb2968657f9841b0.zip
Fix issue with ld path
-rw-r--r--TODO.norg1
-rw-r--r--flake.nix15
2 files changed, 12 insertions, 4 deletions
diff --git a/TODO.norg b/TODO.norg
index 6d705d1..0d326d1 100644
--- a/TODO.norg
+++ b/TODO.norg
@@ -3,6 +3,7 @@
* Later
- ( ) Look into making controls cross-platform (remove x11?)
+ - ( ) Switch to {test-fixture}[https://hackage.haskell.org/package/test-fixture]
* Maybe
- ( ) Scroll
diff --git a/flake.nix b/flake.nix
index c28bd0e..32fdf3c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -25,7 +25,13 @@
otherFiles = [
{ source = ./static; target = "static"; }
];
- configurationFlags = [ "--ghc-options=-O2" ];
+ configurationFlags = [
+ "--ghc-options=-O2"
+ ];
+ buildInputs = with pkgs; [
+ xorg.libXtst
+ xorg.libX11
+ ];
in {
haskellProjects.default = {
inherit projectRoot;
@@ -48,7 +54,7 @@
};
devShell = {
- hlsCheck.enable = false;
+ hlsCheck.enable = true;
};
autoWire = [ "packages" "apps" "checks" ];
@@ -64,9 +70,10 @@
packages = with pkgs; [
just
nodemon
- xorg.libXtst
- xorg.libX11
];
+ inherit buildInputs;
+
+ LD_LIBRARY_PATH = "${pkgs.lib.makeLibraryPath buildInputs}";
};
};
};