From 479d317fc7b42a5cd6744e6f7f80892804b877e2 Mon Sep 17 00:00:00 2001 From: arne Date: Sun, 5 May 2024 20:46:37 +0200 Subject: [PATCH] Reverting jogl / gluegen build experiment to enable opengl renderer --- flake.nix | 31 +------------------------------ 1 file changed, 1 insertion(+), 30 deletions(-) diff --git a/flake.nix b/flake.nix index 1b14c2e..5b55984 100644 --- a/flake.nix +++ b/flake.nix @@ -4,36 +4,7 @@ outputs = { self, nixpkgs }: let system = "x86_64-linux"; - pkgs = import nixpkgs { - inherit system; - overlays = [ - (self: super: { - jogl = super.jogl.overrideAttrs { - # upstream jogl doesn't have the required gluegen lib - installPhase = '' - runHook preInstall - - mkdir -p $out/share/java - cp -v $NIX_BUILD_TOP/gluegen/build/gluegen-rt{,-natives-linux-*}.jar $out/share/java/ - cp -v $NIX_BUILD_TOP/jogl/build/jar/jogl-all{,-natives-linux-*}.jar $out/share/java/ - cp -v $NIX_BUILD_TOP/jogl/build/nativewindow/nativewindow{,-awt,-natives-linux-*,-os-drm,-os-x11}.jar $out/share/java/ - - mkdir -p $out/lib - cp -v $NIX_BUILD_TOP/gluegen/build/obj/*.so $out/lib - cp -v $NIX_BUILD_TOP/gluegen/build/test/build/natives/*.so $out/lib - cp -v $NIX_BUILD_TOP/jogl/build/jogl/obj/jogl/*.so $out/lib - cp -v $NIX_BUILD_TOP/jogl/build/jogl/obj/*.so $out/lib - cp -v $NIX_BUILD_TOP/jogl/build/lib/*.so $out/lib - cp -v $NIX_BUILD_TOP/jogl/build/nativewindow/obj/*.so $out/lib - cp -v $NIX_BUILD_TOP/jogl/build/newt/obj/*.so $out/lib - cp -v $NIX_BUILD_TOP/jogl/build/oculusvr/obj/*.so $out/lib - - runHook postInstall - ''; - }; - }) - ]; - }; + pkgs = import nixpkgs { inherit system; }; lib = pkgs.lib; in { devShells.${system}.default = pkgs.mkShell rec {