Merge pull request #41621 from orivej/dwarf-therapist

dwarf-therapist: fix build

authored by Sarah Brofeldt and committed by GitHub 41cdec2e 5e35e993

+2 -17
-15
pkgs/games/dwarf-fortress/dwarf-therapist/default.nix
··· 11 sha256 = "0b5y7800nzydn0jcc0vglgi9mzkj8f3qhw16wd872cf5396xnag9"; 12 }; 13 14 - outputs = [ "out" "layouts" ]; 15 buildInputs = [ qtbase qtdeclarative ]; 16 nativeBuildInputs = [ texlive cmake ninja ]; 17 - 18 - configurePhase = '' 19 - cmake -GNinja 20 - ''; 21 - 22 - buildPhase = '' 23 - ninja -j$NIX_BUILD_CORES 24 - ''; 25 - 26 - installPhase = '' 27 - mkdir -p $out/bin 28 - cp ./DwarfTherapist $out/bin/DwarfTherapist 29 - cp -r ./share/memory_layouts $layouts 30 - ''; 31 32 meta = with stdenv.lib; { 33 description = "Tool to manage dwarves in in a running game of Dwarf Fortress";
··· 11 sha256 = "0b5y7800nzydn0jcc0vglgi9mzkj8f3qhw16wd872cf5396xnag9"; 12 }; 13 14 buildInputs = [ qtbase qtdeclarative ]; 15 nativeBuildInputs = [ texlive cmake ninja ]; 16 17 meta = with stdenv.lib; { 18 description = "Tool to manage dwarves in in a running game of Dwarf Fortress";
+2 -2
pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix
··· 18 postBuild = '' 19 # DwarfTherapist assumes it's run in $out/share/dwarftherapist and 20 # therefore uses many relative paths. 21 - wrapProgram $out/bin/DwarfTherapist \ 22 --run "cd $out/share/dwarftherapist" 23 24 rm -rf $out/share/dwarftherapist/memory_layouts/linux ··· 26 origmd5=$(cat "${dfHashFile}.orig" | cut -c1-8) 27 patchedmd5=$(cat "${dfHashFile}" | cut -c1-8) 28 substitute \ 29 - ${dt.layouts}/${inifile} \ 30 $out/share/dwarftherapist/memory_layouts/${inifile} \ 31 --replace "$origmd5" "$patchedmd5" 32 '';
··· 18 postBuild = '' 19 # DwarfTherapist assumes it's run in $out/share/dwarftherapist and 20 # therefore uses many relative paths. 21 + wrapProgram $out/bin/dwarftherapist \ 22 --run "cd $out/share/dwarftherapist" 23 24 rm -rf $out/share/dwarftherapist/memory_layouts/linux ··· 26 origmd5=$(cat "${dfHashFile}.orig" | cut -c1-8) 27 patchedmd5=$(cat "${dfHashFile}" | cut -c1-8) 28 substitute \ 29 + ${dt}/share/dwarftherapist/memory_layouts/${inifile} \ 30 $out/share/dwarftherapist/memory_layouts/${inifile} \ 31 --replace "$origmd5" "$patchedmd5" 32 '';