tjh.dev / nixpkgs
Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)
fork atom
nixpkgs / pkgs / games / doom-ports / doomseeker / fix_paths.patch
at devShellTools-shell 30 lines 1.2 kB view raw
1diff --git a/src/core/pathfinder/pathfinder.cpp b/src/core/pathfinder/pathfinder.cpp 2index f277283a..454a8145 100644 3--- a/src/core/pathfinder/pathfinder.cpp 4+++ b/src/core/pathfinder/pathfinder.cpp 5@@ -137,9 +137,7 @@ PathFinder PathFinder::genericPathFinder(const QStringList &suffixes) 6 << DataPaths::programFilesDirectory(DataPaths::x64) 7 << DataPaths::programFilesDirectory(DataPaths::x86); 8 #else 9- paths << "/usr/bin" << "/usr/local/bin" << "/usr/share/bin" 10- << "/usr/games/" << "/usr/local/games/" 11- << "/usr/share/games/" << QCoreApplication::applicationDirPath() << "."; 12+ paths << gDefaultDataPaths->workingDirectory() << "."; 13 #endif 14 QStringList pathsCopy(paths); 15 for (const QString &path : pathsCopy) 16diff --git a/src/core/pathfinder/wadpathfinder.cpp b/src/core/pathfinder/wadpathfinder.cpp 17index 07df0b64..6300542d 100644 18--- a/src/core/pathfinder/wadpathfinder.cpp 19+++ b/src/core/pathfinder/wadpathfinder.cpp 20@@ -84,10 +84,6 @@ public: 21 QStringList defaultPaths() 22 { 23 QStringList paths; 24- #ifdef Q_OS_UNIX 25- paths << "/usr/local/share/games/doom/" 26- << "/usr/share/games/doom/"; 27- #endif 28 return paths; 29 } 30 };