diff options
author | Herwig Hochleitner <herwig@bendlas.net> | 2017-07-28 12:08:32 +0200 |
---|---|---|
committer | Herwig Hochleitner <herwig@bendlas.net> | 2017-10-28 14:55:16 +0200 |
commit | d6ee81e912c5dbfb7db23387c31996b258d0193f (patch) | |
tree | 175bd72155b20b9509adf4e3ee5c1eea50b40121 /pkgs/games/dwarf-fortress | |
parent | 59b35013bcf22cb9f32372c0019d7b1a0f91b0d8 (diff) | |
download | nixlib-d6ee81e912c5dbfb7db23387c31996b258d0193f.tar nixlib-d6ee81e912c5dbfb7db23387c31996b258d0193f.tar.gz nixlib-d6ee81e912c5dbfb7db23387c31996b258d0193f.tar.bz2 nixlib-d6ee81e912c5dbfb7db23387c31996b258d0193f.tar.lz nixlib-d6ee81e912c5dbfb7db23387c31996b258d0193f.tar.xz nixlib-d6ee81e912c5dbfb7db23387c31996b258d0193f.tar.zst nixlib-d6ee81e912c5dbfb7db23387c31996b258d0193f.zip |
dwarf-fortress-packages.dwarf-therapist: update for df 43.05
Similar to the LNP, we use Hello71's fork, which features support for the (first 64bit) version 43.05 of Dwarf Fortress. http://dffd.bay12games.com/file.php?id=12762
Diffstat (limited to 'pkgs/games/dwarf-fortress')
-rw-r--r-- | pkgs/games/dwarf-fortress/dwarf-therapist/default.nix | 33 | ||||
-rw-r--r-- | pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix | 2 |
2 files changed, 20 insertions, 15 deletions
diff --git a/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix b/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix index bfdedcdd133f..e7ef9a02eb70 100644 --- a/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix +++ b/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix @@ -1,29 +1,34 @@ -{ stdenv, fetchFromGitHub, coreutils, qtbase, qtdeclarative, qmake, texlive }: +{ stdenv, fetchFromGitHub, coreutils, qtbase, qtdeclarative, cmake, texlive, ninja }: stdenv.mkDerivation rec { name = "dwarf-therapist-original-${version}"; - version = "37.0.0"; + version = "37.0.0-Hello71"; src = fetchFromGitHub { - owner = "splintermind"; + ## We use `Hello71`'s fork for 43.05 support + # owner = "splintermind"; + owner = "Hello71"; repo = "Dwarf-Therapist"; - rev = "v${version}"; - sha256 = "0dw86b4x5hjhb7h4ynvwjgcinpqywfc5l48ljb5sahz08rfnx63d"; + rev = "42ccaa71f6077ebdd41543255a360c3470812b97"; + sha256 = "0f6mlfck7q31jl5cb6d6blf5sb7cigvvs2rn31k16xc93hsdgxaz"; }; outputs = [ "out" "layouts" ]; buildInputs = [ qtbase qtdeclarative ]; - nativeBuildInputs = [ texlive qmake ]; + nativeBuildInputs = [ texlive cmake ninja ]; - enableParallelBuilding = false; + configurePhase = '' + cmake -GNinja + ''; + + buildPhase = '' + ninja -j$NIX_BUILD_CORES + ''; - # Move layout files so they cannot be found by Therapist - postInstall = '' - mkdir -p $layouts - mv $out/share/dwarftherapist/memory_layouts/* $layouts - rmdir $out/share/dwarftherapist/memory_layouts - # Useless symlink - rm $out/bin/dwarftherapist + installPhase = '' + mkdir -p $out/bin + cp ./DwarfTherapist $out/bin/DwarfTherapist + cp -r ./share/memory_layouts $layouts ''; meta = with stdenv.lib; { diff --git a/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix b/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix index cbc8d31e6750..3a1a52d44cdb 100644 --- a/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix +++ b/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix @@ -3,7 +3,7 @@ let df = dwarf-fortress-original; dt = dwarf-therapist-original; - inifile = "linux/v0${df.baseVersion}.${df.patchVersion}.ini"; + inifile = "linux/v0.${df.baseVersion}.${df.patchVersion}.ini"; dfHashFile = "${df}/hash.md5"; in symlinkJoin { |