From 0075c83b5e971a72b67e05f481d051233c4881ea Mon Sep 17 00:00:00 2001 From: arne Date: Fri, 20 Feb 2026 09:00:03 +0100 Subject: [PATCH] Fix `:renderer :p2d` so it's at least starting from within emacs --- .gitignore | 3 +++ deps.edn | 23 ++++++++++++++++++++--- flake.lock | 6 +++--- flake.nix | 7 ++++--- 4 files changed, 30 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 9d56060..fcc3216 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,8 @@ /.direnv/ /.cpcache/ +/exports +/resources +.rebel_readline_history # Created by https://www.gitignore.io/api/clojure diff --git a/deps.edn b/deps.edn index 327e443..9493b93 100644 --- a/deps.edn +++ b/deps.edn @@ -1,7 +1,24 @@ -{:deps {#_#_ org.clojure/clojure {:mvn/version "1.11.1"} - quil/quil {:mvn/version "4.3.1563"} +{#_#_ :mvn/repos {"jogl" {:url "https://jogamp.org/deployment/maven/"}} + :deps {#_#_ org.clojure/clojure {:mvn/version "1.11.1"} + quil/quil {:mvn/version "4.3.1563" + #_#_ :exclusions [org.jogamp.jogl/jogl-all + org.jogamp.gluegen/gluegen-rt]} thi.ng/geom {:mvn/version "1.0.0-RC3" :exclusions [org.jogamp.jogl/jogl-all org.jogamp.gluegen/gluegen-rt]} com.cnuernber/charred {:mvn/version "1.034"} - overtone/osc-clj {:mvn/version "0.9.0"}}} + overtone/osc-clj {:mvn/version "0.9.0"} + + ;; ;; native display code + ;; org.jogamp.gluegen/gluegen-rt {:mvn/version "2.5.0"} + ;; org.jogamp.gluegen/gluegen-rt$natives-macosx-universal {:mvn/version "2.5.0"} + ;; org.jogamp.gluegen/gluegen-rt$natives-linux-amd64 {:mvn/version "2.5.0"} + ;; org.jogamp.gluegen/gluegen-rt$natives-linux-aarch64 {:mvn/version "2.5.0"} + ;; org.jogamp.gluegen/gluegen-rt$natives-windows-amd64 {:mvn/version "2.5.0"} + + ;; org.jogamp.jogl/jogl-all {:mvn/version "2.5.0"} + ;; org.jogamp.jogl/jogl-all$natives-macosx-universal {:mvn/version "2.5.0"} + ;; org.jogamp.jogl/jogl-all$natives-linux-amd64 {:mvn/version "2.5.0"} + ;; org.jogamp.jogl/jogl-all$natives-linux-aarch64 {:mvn/version "2.5.0"} + ;; org.jogamp.jogl/jogl-all$natives-windows-amd64 {:mvn/version "2.5.0"} + }} diff --git a/flake.lock b/flake.lock index 6de6815..0a331a5 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1741513245, - "narHash": "sha256-7rTAMNTY1xoBwz0h7ZMtEcd8LELk9R5TzBPoHuhNSCk=", + "lastModified": 1771432645, + "narHash": "sha256-ZqRiU5/c+1+QoeaMJJgpqjwimCSNnIl0AUW4z7Md6Ps=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e3e32b642a31e6714ec1b712de8c91a3352ce7e1", + "rev": "02263f46911178e286242786fd6ea1d229583fbb", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 3bde407..bd4960b 100644 --- a/flake.nix +++ b/flake.nix @@ -10,13 +10,14 @@ devShells.${system}.default = pkgs.mkShell rec { name = "quil-env"; buildInputs = [ - pkgs.xorg_sys_opengl - pkgs.xorg.libXxf86vm - pkgs.xwayland pkgs.clojure + + pkgs.libGL + pkgs.libxxf86vm # pkgs.jogl ]; LD_LIBRARY_PATH = "${lib.makeLibraryPath buildInputs}"; + JAVA_OPTS = "-Dawt.useSystemAAFontSettings=lcd"; # wayland compat # see https://discourse.ubuntu.com/t/environment-variables-for-wayland-hackers/12750