From 8de280d7e5bc2bdb60761190bd446ac21290caed Mon Sep 17 00:00:00 2001 From: Julian Mutter Date: Mon, 23 Mar 2026 20:39:47 +0100 Subject: [PATCH] Remove my own trys for pob wrapper --- .../features/suites/desktop/default.nix | 2 - pkgs/default.nix | 2 - pkgs/pob2-frajul/default.nix | 16 ---- pkgs/pob2/default.nix | 88 ------------------- 4 files changed, 108 deletions(-) delete mode 100644 pkgs/pob2-frajul/default.nix delete mode 100644 pkgs/pob2/default.nix diff --git a/homes/julian/features/suites/desktop/default.nix b/homes/julian/features/suites/desktop/default.nix index 5e41cf9..d888784 100644 --- a/homes/julian/features/suites/desktop/default.nix +++ b/homes/julian/features/suites/desktop/default.nix @@ -52,7 +52,6 @@ # rustdesk tor-browser rusty-path-of-building # Path of Building for poe1 and poe2 - # frajul.pob-dev-version # Path of Building vlc wineWowPackages.stable # 32-bit and 64-bit wine winetricks @@ -69,6 +68,5 @@ ## My scripts frajul.open-messaging frajul.xwacomcalibrate - frajul.pob2-frajul ]; } diff --git a/pkgs/default.nix b/pkgs/default.nix index c12ffdf..be852d8 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -10,11 +10,9 @@ sos = pkgs.callPackage ./sos {}; xwacomcalibrate = pkgs.callPackage ./xwacomcalibrate {}; acer-battery-health-mode = pkgs.callPackage ./acer-battery-health-mode {}; - pob2 = pkgs.callPackage ./pob2 {}; wl-ocr = pkgs.callPackage ./wl-ocr {}; rtklib = pkgs.qt6Packages.callPackage ./rtklib {}; typst-languagetool = pkgs.callPackage ./typst-languagetool {}; - pob2-frajul = pkgs.callPackage ./pob2-frajul {}; # rpi-ws281x-python = pkgs.callPackage ./rpi-ws281x-python {}; # piano-led-visualizer = pkgs.callPackage ./piano-led-visualizer {}; diff --git a/pkgs/pob2-frajul/default.nix b/pkgs/pob2-frajul/default.nix deleted file mode 100644 index 90963f9..0000000 --- a/pkgs/pob2-frajul/default.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ - writeShellApplication, - xhost, -}: -writeShellApplication { - name = "pob2-frajul"; - - runtimeInputs = [ - xhost - ]; - - text = '' - xhost + - sudo -u pob -i sh /home/pob/pob2.sh - ''; -} diff --git a/pkgs/pob2/default.nix b/pkgs/pob2/default.nix deleted file mode 100644 index 1eb93c5..0000000 --- a/pkgs/pob2/default.nix +++ /dev/null @@ -1,88 +0,0 @@ -{ - pkgs, - stdenv, - lib, - fetchFromGitHub, - unzip, - ... -}: let - data = stdenv.mkDerivation (finalAttrs: { - pname = "path-of-building-data"; - version = "dev-version"; - - src = fetchFromGitHub { - owner = "PathOfBuildingCommunity"; - repo = "PathOfBuilding-PoE2"; - rev = "3c579af5612d2137d37558d40d797801b5bbaa69"; - hash = "sha256-hRS4k2V9Ze6dc7BMA0iZxjCOZgqPa3Cu7gRZiVLrFR4="; - }; - - nativeBuildInputs = [unzip]; - - buildCommand = '' - # I have absolutely no idea how this file is generated - # and I don't think I want to know. The Flatpak also does this. - unzip -j -d $out $src/runtime-win32.zip lua/sha1.lua - - # Install the actual data - cp -r $src/src $src/runtime/lua/*.lua $src/manifest.xml $out - - # Pretend this is an official build so we don't get the ugly "dev mode" warning - substituteInPlace $out/manifest.xml --replace ' $out/src/UpdateCheck.lua - ''; - }); -in - stdenv.mkDerivation { - pname = "path-of-building-2"; - version = "${data.version}-unstable-2023-04-09"; - - src = fetchFromGitHub { - owner = "ernstp"; - repo = "pobfrontend"; - rev = "9faa19aa362f975737169824c1578d5011487c18"; - hash = "sha256-zhw2PZ6ZNMgZ2hG+a6AcYBkeg7kbBHNc2eSt4if17Wk="; - }; - - nativeBuildInputs = with pkgs; [ - meson - ninja - pkg-config - kdePackages.qttools - kdePackages.wrapQtAppsHook - ]; - buildInputs = with pkgs; [ - kdePackages.qtbase - luajit - luajit.pkgs.lua-curl - ]; - - installPhase = '' - runHook preInstall - install -Dm555 pobfrontend $out/bin/pobfrontend - runHook postInstall - ''; - - preFixup = '' - qtWrapperArgs+=( - --set LUA_PATH "$LUA_PATH" - --set LUA_CPATH "$LUA_CPATH" - --chdir "${data}" - ) - ''; - - passthru.data = data; - - meta = { - description = "Offline build planner for Path of Exile"; - homepage = "https://pathofbuilding.community/"; - license = lib.licenses.mit; - maintainers = [lib.maintainers.k900]; - mainProgram = "pobfrontend"; - broken = stdenv.isDarwin; # doesn't find uic6 for some reason - }; - }