near/heyarne.aphorisms
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix project

Browse source
This commit is contained in:
arne 2022-11-20 17:45:06 +01:00
commit 4956092296
3 changed files with 23 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

23
flake.nix
View file

@ -5,7 +5,28 @@
let let
system = "x86_64-linux"; system = "x86_64-linux";
pkgs = nixpkgs.legacyPackages.${system}; pkgs = nixpkgs.legacyPackages.${system};
lib = pkgs.lib;
in { in {
devShell.${system} = import ./shell.nix { inherit pkgs; }; devShell.${system} = pkgs.mkShell rec {
name = "quil-env";
buildInputs = with pkgs; [
xorg_sys_opengl
# xwayland
clojure
];
LD_LIBRARY_PATH = "${lib.makeLibraryPath buildInputs}";
# wayland compat
# see https://discourse.ubuntu.com/t/environment-variables-for-wayland-hackers/12750
WAYLAND_DISPLAY = "no";
DISPLAY = ":0";
_JAVA_AWT_WM_NONREPARENTING = "1";
# we need to make sure the library is on the path for JOGL;
# also, there's a bug that is avoided with the variable
# https://github.com/processing/processing/issues/5476
# JAVA_OPTS = "-Djava.library.path=${lib.makeLibraryPath buildInputs} -Djogl.disable.openglcore=true";
# LIBGL_ALWAYS_SOFTWARE = true; # ← this is the same as passing -Djogl.disable.openglcore="true"
};
}; };
} }

25
shell.nix
View file

@ -1,25 +0,0 @@
{ pkgs ? import <nixpkgs> { }, }:
let
lib = pkgs.lib;
in pkgs.mkShell rec {
name = "quil-env";
buildInputs = with pkgs; [
xorg_sys_opengl
xwayland
clojure
];
LD_LIBRARY_PATH = "${lib.makeLibraryPath buildInputs}";
# wayland compat
# see https://discourse.ubuntu.com/t/environment-variables-for-wayland-hackers/12750
WAYLAND_DISPLAY = "no";
DISPLAY = ":0";
_JAVA_AWT_WM_NONREPARENTING = "1";
# we need to make sure the library is on the path for JOGL;
# also, there's a bug that is avoided with the variable
# https://github.com/processing/processing/issues/5476
JAVA_OPTS = "-Djava.library.path=${lib.makeLibraryPath buildInputs} -Djogl.disable.openglcore=true";
# LIBGL_ALWAYS_SOFTWARE = true; # ← this is the same as passing -Djogl.disable.openglcore="true"
}

2
src/aphorisms/quil/drawable.clj
View file

@ -27,7 +27,7 @@
([poly attrs] ([poly attrs]
(quil-attrs! attrs) (quil-attrs! attrs)
(doseq [[a b] (partition 2 1 (:points poly))] (doseq [[a b] (partition 2 1 (:points poly))]
(q/poly a b)))) (q/line a b))))
Line2 Line2
(draw (draw