diff options
author | Alyssa Ross <hi@alyssa.is> | 2023-09-12 08:14:37 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2023-09-12 08:14:37 +0000 |
commit | 7d648ac22d941d0c7efdd987315ae0ddf9932ba0 (patch) | |
tree | 51a3e8126722c5a52a9a1e7e40b4eeaf4610db0b /nixpkgs/pkgs/applications/misc/smb3-foundry/fix-relative-dirs.patch | |
parent | aa4353b499e6950b7333578f936455a628145c31 (diff) | |
parent | db9208ab987cdeeedf78ad9b4cf3c55f5ebd269b (diff) | |
download | nixlib-7d648ac22d941d0c7efdd987315ae0ddf9932ba0.tar nixlib-7d648ac22d941d0c7efdd987315ae0ddf9932ba0.tar.gz nixlib-7d648ac22d941d0c7efdd987315ae0ddf9932ba0.tar.bz2 nixlib-7d648ac22d941d0c7efdd987315ae0ddf9932ba0.tar.lz nixlib-7d648ac22d941d0c7efdd987315ae0ddf9932ba0.tar.xz nixlib-7d648ac22d941d0c7efdd987315ae0ddf9932ba0.tar.zst nixlib-7d648ac22d941d0c7efdd987315ae0ddf9932ba0.zip |
Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs
Diffstat (limited to 'nixpkgs/pkgs/applications/misc/smb3-foundry/fix-relative-dirs.patch')
-rw-r--r-- | nixpkgs/pkgs/applications/misc/smb3-foundry/fix-relative-dirs.patch | 34 |
1 files changed, 0 insertions, 34 deletions
diff --git a/nixpkgs/pkgs/applications/misc/smb3-foundry/fix-relative-dirs.patch b/nixpkgs/pkgs/applications/misc/smb3-foundry/fix-relative-dirs.patch deleted file mode 100644 index d49ddde897b4..000000000000 --- a/nixpkgs/pkgs/applications/misc/smb3-foundry/fix-relative-dirs.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff --git a/foundry/gui/WarningList.py b/foundry/gui/WarningList.py -index ace83d7..46012df 100644 ---- a/foundry/gui/WarningList.py -+++ b/foundry/gui/WarningList.py -@@ -5,6 +5,7 @@ from PySide6.QtCore import QEvent, QRect, Qt, Signal, SignalInstance - from PySide6.QtGui import QCursor, QFocusEvent - from PySide6.QtWidgets import QLabel, QVBoxLayout, QWidget - -+from foundry import root_dir - from foundry.game import GROUND - from foundry.game.ObjectDefinitions import GeneratorType - from foundry.game.gfx.objects import EnemyItem -@@ -216,7 +217,7 @@ class WarningList(QWidget): - return [enemy for enemy in self.level_ref.level.enemies if enemy.type == enemy_id] - - def _build_enemy_clan_dict(self): -- with open("data/enemy_data.json", "r") as enemy_data_file: -+ with open(root_dir.joinpath("data", "enemy_data.json"), "r") as enemy_data_file: - enemy_data = json.loads(enemy_data_file.read()) - - self._enemy_dict.clear() -diff --git a/smb3parse/util/parser/__init__.py b/smb3parse/util/parser/__init__.py -index ecef169..8bba57e 100644 ---- a/smb3parse/util/parser/__init__.py -+++ b/smb3parse/util/parser/__init__.py -@@ -302,7 +302,7 @@ def gen_levels_in_rom( - - print("---------------------", level_count, "------------------------") - -- level_data = pathlib.Path("data/levels.dat") -+ level_data = pathlib.Path(__file__).parent.parent.parent.joinpath("data", "levels.dat") - - missing = 0 - levels: dict[int, set[int]] = defaultdict(set) |