diff options
author | Orivej Desh <orivej@gmx.fr> | 2018-06-07 09:04:45 +0000 |
---|---|---|
committer | Jean-Philippe Bernardy <jeanphilippe.bernardy@gmail.com> | 2018-06-08 15:12:12 +0200 |
commit | 1b6dcf493661bc18f8ffd4b327f73b0d2d91aa8b (patch) | |
tree | d8b97f962b9c43d1ee90d72c3f18601cbd6c0729 /pkgs | |
parent | 5e35e9934c50489ce0f42b329c25b7ceb7153d52 (diff) | |
download | nixlib-1b6dcf493661bc18f8ffd4b327f73b0d2d91aa8b.tar nixlib-1b6dcf493661bc18f8ffd4b327f73b0d2d91aa8b.tar.gz nixlib-1b6dcf493661bc18f8ffd4b327f73b0d2d91aa8b.tar.bz2 nixlib-1b6dcf493661bc18f8ffd4b327f73b0d2d91aa8b.tar.lz nixlib-1b6dcf493661bc18f8ffd4b327f73b0d2d91aa8b.tar.xz nixlib-1b6dcf493661bc18f8ffd4b327f73b0d2d91aa8b.tar.zst nixlib-1b6dcf493661bc18f8ffd4b327f73b0d2d91aa8b.zip |
dwarf-therapist: fix build
Update for dfc4744afd82b2d26a8df71b05ffacf05230af50.
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/games/dwarf-fortress/dwarf-therapist/default.nix | 15 | ||||
-rw-r--r-- | pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix | 4 |
2 files changed, 2 insertions, 17 deletions
diff --git a/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix b/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix index 6d96f98aec94..2e54258c4be9 100644 --- a/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix +++ b/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix @@ -11,24 +11,9 @@ stdenv.mkDerivation rec { sha256 = "0b5y7800nzydn0jcc0vglgi9mzkj8f3qhw16wd872cf5396xnag9"; }; - outputs = [ "out" "layouts" ]; buildInputs = [ qtbase qtdeclarative ]; nativeBuildInputs = [ texlive cmake ninja ]; - configurePhase = '' - cmake -GNinja - ''; - - buildPhase = '' - ninja -j$NIX_BUILD_CORES - ''; - - installPhase = '' - mkdir -p $out/bin - cp ./DwarfTherapist $out/bin/DwarfTherapist - cp -r ./share/memory_layouts $layouts - ''; - meta = with stdenv.lib; { description = "Tool to manage dwarves in in a running game of Dwarf Fortress"; maintainers = with maintainers; [ the-kenny abbradar bendlas ]; diff --git a/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix b/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix index 6debf0bb0b2b..f9e3e468cdc0 100644 --- a/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix +++ b/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix @@ -18,7 +18,7 @@ in symlinkJoin { postBuild = '' # DwarfTherapist assumes it's run in $out/share/dwarftherapist and # therefore uses many relative paths. - wrapProgram $out/bin/DwarfTherapist \ + wrapProgram $out/bin/dwarftherapist \ --run "cd $out/share/dwarftherapist" rm -rf $out/share/dwarftherapist/memory_layouts/linux @@ -26,7 +26,7 @@ in symlinkJoin { origmd5=$(cat "${dfHashFile}.orig" | cut -c1-8) patchedmd5=$(cat "${dfHashFile}" | cut -c1-8) substitute \ - ${dt.layouts}/${inifile} \ + ${dt}/share/dwarftherapist/memory_layouts/${inifile} \ $out/share/dwarftherapist/memory_layouts/${inifile} \ --replace "$origmd5" "$patchedmd5" ''; |