From fc4d437fd1e36554adcefa8cd23daf8df30a36d3 Mon Sep 17 00:00:00 2001 From: Moritz Ulrich Date: Mon, 26 Jan 2015 00:00:57 +0100 Subject: [PATCH] Dwarf Therapist: Update to git-prerelease. Necessary to support Dwarf Fortress 0.40.24. --- pkgs/games/dwarf-therapist/default.nix | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/pkgs/games/dwarf-therapist/default.nix b/pkgs/games/dwarf-therapist/default.nix index 9ecfe3c0acd..6d7eaf30736 100644 --- a/pkgs/games/dwarf-therapist/default.nix +++ b/pkgs/games/dwarf-therapist/default.nix @@ -1,15 +1,16 @@ -{ stdenv, coreutils, fetchurl, qt4, dwarf_fortress, bash, makeWrapper }: +{ stdenv, coreutils, fetchgit, qt4, dwarf_fortress, bash, makeWrapper }: let - version = "30.1.0"; + version = "30.2.0pre"; df = dwarf_fortress; in stdenv.mkDerivation rec { name = "dwarf-therapist-${version}"; - src = fetchurl { - url = "https://github.com/splintermind/Dwarf-Therapist/archive/v${version}.tar.gz"; - sha256 = "1x9dkis6b3f8iqcfrc2cj9mcgkwf0rzhxhq2lgy4xdr2n0yjkyv7"; + src = fetchgit { + url = "https://github.com/splintermind/Dwarf-Therapist.git"; + rev = "65bb15a29d616d788c20a3344058b7277e4fadba"; + sha256 = "1q1n9sm0lgmn52m4aigb22cdfbh2s569y1mn5cmimgj600i6c2f2"; }; # Needed for hashing @@ -19,12 +20,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = false; configurePhase = '' - substituteInPlace dwarftherapist.pro \ - --replace /usr/bin $out/bin \ - --replace /usr/share $out/share \ - --replace "INSTALLS += doc" "" - - qmake INSTALL_PREFIX=$out + qmake PREFIX=$out ''; postInstall = ''