Skip to content

Commit

Permalink
Update to coffi 1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
IGJoshua committed Oct 2, 2024
1 parent 592d702 commit 337f983
Show file tree
Hide file tree
Showing 4 changed files with 129 additions and 62 deletions.
9 changes: 4 additions & 5 deletions deps.edn
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{:paths ["src" "resources"]
:deps {org.clojure/clojure {:mvn/version "1.10.3"}
org.suskalo/coffi {:mvn/version "0.2.259"}
:deps {org.clojure/clojure {:mvn/version "1.11.4"}
org.suskalo/coffi {:mvn/version "1.0.450"}
org.clojure/tools.logging {:mvn/version "1.1.0"}}
:aliases
{:local-coffi {:override-deps {org.suskalo/coffi {:local/root "../coffi"}}}
:dev {:extra-paths ["." "dev"]
:extra-deps {io.github.clojure/tools.build {:git/tag "v0.3.0" :git/sha "e418fc9"}
ch.qos.logback/logback-classic {:mvn/version "1.2.6"}}
:jvm-opts ["--add-modules=jdk.incubator.foreign" "--enable-native-access=ALL-UNNAMED"
:jvm-opts ["--enable-native-access=ALL-UNNAMED"
"-Dclojure.tools.logging.factory=clojure.tools.logging.impl/slf4j-factory"]}
:test
{:extra-paths ["test"]
Expand All @@ -26,8 +26,7 @@
:output-path "docs"
:source-uri "https://github.com/IGJoshua/glfw-clj/blob/{git-commit}/{filepath}#L{line}"
:metadata {:doc/format :markdown}}
:jvm-opts ["--add-modules=jdk.incubator.foreign" "--enable-native-access=ALL-UNNAMED"
"--add-opens" "java.base/java.lang=ALL-UNNAMED"]}
:jvm-opts ["--enable-native-access=ALL-UNNAMED" "--add-opens" "java.base/java.lang=ALL-UNNAMED"]}

:build {:replace-deps {org.clojure/clojure {:mvn/version "1.10.3"}
io.github.clojure/tools.build {:git/tag "v0.3.0" :git/sha "e418fc9"}}
Expand Down
26 changes: 26 additions & 0 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

42 changes: 42 additions & 0 deletions flake.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
{
inputs = {
nixpkgs.url = "nixpkgs/nixos-unstable";
};
outputs = { self, nixpkgs }:
let
system = "x86_64-linux";
pkgs = import nixpkgs {
inherit system;
overlays = [
(final: prev: {
clojure = prev.clojure.override { jdk = final.jdk22; };
})
];
};
in
{
devShells.${system}.default = pkgs.mkShell rec {
packages = [
];

nativeBuildInputs = with pkgs; [
clojure
];

buildInputs = with pkgs; [
xorg.libX11
libGL
glfw
];

inputsFrom = with pkgs; [
];

LD_LIBRARY_PATH=pkgs.lib.makeLibraryPath (with pkgs; [
xorg.libX11
libGL
glfw
]);
};
};
}
Loading

0 comments on commit 337f983

Please sign in to comment.