commit 072fd2537859a9b8c2e5287a2e0a0a840b0be137 · pyrox.dev/nixpkgs

+6 -13

pkgs/games/dwarf-fortress/dfhack/default.nix

···

       120
       120
        
             name = "rename-lerp.patch";

     

       121
       121
        
             url = "https://github.com/DFHack/dfhack/commit/389dcf5cfcdb8bfb8deeb05fa5756c9f4f5709d1.patch";

     

       122
       122
        
             hash = "sha256-QuDtGURhP+nM+x+8GIKO5LrMcmBkl9JSHHIeqzqGIPQ=";

     

       123
       123
       -
           });

     

       123
       123
       +
           })

     

       124
       124
       +
           # Newer versions use SDL_GetBasePath and SDL_GetPrefPath with a Windows-esque directory

     

       125
       125
       +
           # that mismatches where we have historically stored data in nixpkgs:

     

       126
       126
       +
           # https://github.com/libsdl-org/SDL/blob/release-2.24.x/src/filesystem/unix/SDL_sysfilesystem.c#L136

     

       127
       127
       +
           # Use SDL_GetPrefPath since this takes XDG_DATA_HOME into account (which is correct).

     

       128
       128
       +
           ++ optional (versionAtLeast version "52.02-r2") ./use-df-linux-dir.patch;

     

       124
       129
        
       

     

       125
       130
        
         # gcc 11 fix

     

       126
       131
        
         CXXFLAGS = optionalString (versionOlder version "0.47.05-r3") "-fpermissive";

     

       127
       127
       -
       

     

       128
       128
       -
         # As of

     

       129
       129
       -
         # https://github.com/DFHack/dfhack/commit/56e43a0dde023c5a4595a22b29d800153b31e3c4,

     

       130
       130
       -
         # dfhack gets its goodies from the directory above the Dwarf_Fortress

     

       131
       131
       -
         # executable, which leads to stock Dwarf Fortress and not the built

     

       132
       132
       -
         # environment where all the dfhack resources are symlinked to (typically

     

       133
       133
       -
         # ~/.local/share/df_linux). This causes errors like `tweak is not a

     

       134
       134
       -
         # recognized command` to be reported and dfhack to lose some of its

     

       135
       135
       -
         # functionality.

     

       136
       136
       -
         postPatch = ''

     

       137
       137
       -
           sed -i 's@cached_path = path_string.*@cached_path = getenv("DF_DIR");@' library/Process-linux.cpp

     

       138
       138
       -
         '';

     

       139
       132
        
       

     

       140
       133
        
         nativeBuildInputs = [

     

       141
       134
        
           cmake

+25

pkgs/games/dwarf-fortress/dfhack/use-df-linux-dir.patch

···

       1
       1
       +
       diff --git a/library/modules/Filesystem.cpp b/library/modules/Filesystem.cpp

     

       2
       2
       +
       index 7a6b09a50..d5827f016 100644

     

       3
       3
       +
       --- a/library/modules/Filesystem.cpp

     

       4
       4
       +
       +++ b/library/modules/Filesystem.cpp

     

       5
       5
       +
       @@ -232,17 +232,10 @@ std::filesystem::path Filesystem::canonicalize(std::filesystem::path p) noexcept

     

       6
       6
       +
        

     

       7
       7
       +
        std::filesystem::path Filesystem::getInstallDir() noexcept

     

       8
       8
       +
        {

     

       9
       9
       +
       -    return std::filesystem::path{ DFSDL::DFSDL_GetBasePath() };

     

       10
       10
       +
       +    return std::filesystem::path{ DFSDL::DFSDL_GetPrefPath("", "df_linux") };

     

       11
       11
       +
        }

     

       12
       12
       +
        

     

       13
       13
       +
        std::filesystem::path Filesystem::getBaseDir() noexcept

     

       14
       14
       +
        {

     

       15
       15
       +
       -    auto getsavebase = []() {

     

       16
       16
       +
       -        // assume portable mode is _on_ if init is missing

     

       17
       17
       +
       -        if (!df::global::init || df::global::init->media.flag.is_set(df::enums::init_media_flags::PORTABLE_MODE))

     

       18
       18
       +
       -            return DFSDL::DFSDL_GetBasePath();

     

       19
       19
       +
       -        else

     

       20
       20
       +
       -            return DFSDL::DFSDL_GetPrefPath("Bay 12 Games", "Dwarf Fortress");

     

       21
       21
       +
       -        };

     

       22
       22
       +
       -    return std::filesystem::path{ getsavebase() };

     

       23
       23
       +
       +    return std::filesystem::path{ DFSDL::DFSDL_GetPrefPath("", "df_linux") };

     

       24
       24
       +
        }

     

       25
       25
       +