From 96b884dbebd9ccf4ece4938edf8002094dc41cb1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Madeleine=20Sydney=20=C5=9Alaga?= Date: Sun, 21 Jun 2026 01:18:35 -0600 Subject: [PATCH 1/2] awawa --- pkgs/gf-pgf/default.nix | 1 + pkgs/ljtools/default.nix | 28 ++++++++++++++++++++++++++++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/ljtools/default.nix diff --git a/pkgs/gf-pgf/default.nix b/pkgs/gf-pgf/default.nix index ff4c1fa..012ffca 100644 --- a/pkgs/gf-pgf/default.nix +++ b/pkgs/gf-pgf/default.nix @@ -8,4 +8,5 @@ stdenv.mkDerivation { inherit (gf-core) version meta; src = "${gf-core.src}/src/runtime/c"; nativeBuildInputs = [autoreconfHook ]; + broken = true; } diff --git a/pkgs/ljtools/default.nix b/pkgs/ljtools/default.nix new file mode 100644 index 0000000..5c4c889 --- /dev/null +++ b/pkgs/ljtools/default.nix @@ -0,0 +1,28 @@ +{ qt5 +, luajit +, stdenv +, fetchFromGitHub + , GuiTools ? fetchFromGitHub { + owner = "rochus-keller"; + repo = "GuiTools"; + hash = "df36aa5c823d0c81259ae70b7c6f194c88017d6f"; + } +}: + +stdenv.mkDerivation { + pname = "ljtools"; + src = fetchFromGitHub { + owner = "rochus-keller"; + repo = "LjTools"; + hash = ""; + rev = "412675e2cc12bec1e00fd7a2ec52270f388d225b"; + }; + buildInputs = [ + qt5.full + luajit + ]; + nativeBuildInputs = [ + qt5.full + luajit + ]; +} -- 2.54.0 From cc63cf84c93eb437b1dbc1d378377caeba181593 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Madeleine=20Sydney=20=C5=9Alaga?= Date: Sun, 21 Jun 2026 18:25:11 -0600 Subject: [PATCH 2/2] idk --- pkgs/ljtools/default.nix | 46 ++++++++++++++++++++++++++-------------- 1 file changed, 30 insertions(+), 16 deletions(-) diff --git a/pkgs/ljtools/default.nix b/pkgs/ljtools/default.nix index 5c4c889..2b8a03b 100644 --- a/pkgs/ljtools/default.nix +++ b/pkgs/ljtools/default.nix @@ -1,28 +1,42 @@ { qt5 -, luajit -, stdenv -, fetchFromGitHub - , GuiTools ? fetchFromGitHub { - owner = "rochus-keller"; - repo = "GuiTools"; - hash = "df36aa5c823d0c81259ae70b7c6f194c88017d6f"; - } + , breakpointHook + , luajit + , stdenv + , fetchFromGitHub }: -stdenv.mkDerivation { - pname = "ljtools"; - src = fetchFromGitHub { +let + GuiTools-src = fetchFromGitHub { + owner = "rochus-keller"; + repo = "GuiTools"; + rev = "df36aa5c823d0c81259ae70b7c6f194c88017d6f"; + hash = "sha256-RmpVkUjcAkde755QQwfWvC4sOxDLx2itmqw1T1DTOlE="; + name = "GuiTools"; + }; + LjTools-src = fetchFromGitHub { owner = "rochus-keller"; repo = "LjTools"; - hash = ""; + name = "LjTools"; + hash = "sha256-PWh1ZP5+hNXvDpJTaWtegHvcuBkdrZ6oA+bIkEikVHk="; rev = "412675e2cc12bec1e00fd7a2ec52270f388d225b"; }; + luajit-src = luajit.src.override { name = "LuaJIT"; }; +in stdenv.mkDerivation { + pname = "ljtools"; + version = "0.1.0"; + srcs = [ + GuiTools-src + LjTools-src + luajit-src + ]; + sourceRoot = "LjTools"; buildInputs = [ - qt5.full - luajit + qt5.qtbase ]; nativeBuildInputs = [ - qt5.full - luajit + qt5.qtbase + breakpointHook + qt5.wrapQtAppsHook + qt5.qmake ]; } -- 2.54.0