public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dwarf-therapist: add version to derivation, use symlinkJoin

Browse Source
This commit is contained in:
Nikolay Amiantov 2016-04-26 15:27:48 +03:00
parent 7b4fc0f5a9
commit aa1a40b63d
2 changed files with 7 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/games/dwarf-fortress/dwarf-therapist/default.nix
View File

@ -1,10 +1,8 @@
{ stdenv, fetchFromGitHub, coreutils, qtbase, qtdeclarative, qmakeHook, texlive }: { stdenv, fetchFromGitHub, coreutils, qtbase, qtdeclarative, qmakeHook, texlive }:
let stdenv.mkDerivation rec {
version = "37.0.0";
in
stdenv.mkDerivation {
name = "dwarf-therapist-original-${version}"; name = "dwarf-therapist-original-${version}";
version = "37.0.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "splintermind"; owner = "splintermind";

22
pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix
View File

@ -1,4 +1,4 @@
{ buildEnv, lib, dwarf-therapist-original, dwarf-fortress-original, makeWrapper }: { symlinkJoin, lib, dwarf-therapist-original, dwarf-fortress-original, makeWrapper }:
let let
df = dwarf-fortress-original; df = dwarf-fortress-original;
@ -6,8 +6,8 @@ let
inifile = "linux/v0${df.baseVersion}.${df.patchVersion}.ini"; inifile = "linux/v0${df.baseVersion}.${df.patchVersion}.ini";
dfHashFile = "${df}/hash.md5"; dfHashFile = "${df}/hash.md5";
in buildEnv { in symlinkJoin {
name = "dwarf-therapist-${lib.getVersion dt}"; name = "dwarf-therapist-${dt.version}";
paths = [ dt ]; paths = [ dt ];
@ -16,22 +16,10 @@ in buildEnv {
postBuild = '' postBuild = ''
# DwarfTherapist assumes it's run in $out/share/dwarftherapist and # DwarfTherapist assumes it's run in $out/share/dwarftherapist and
# therefore uses many relative paths. # therefore uses many relative paths.
rm $out/bin wrapProgram $out/bin/DwarfTherapist \
mkdir $out/bin
makeWrapper ${dt}/bin/DwarfTherapist $out/bin/DwarfTherapist \
--run "cd $out/share/dwarftherapist" --run "cd $out/share/dwarftherapist"
# Fix checksum of memory access directives. We really need #4621 fixed! rm -rf $out/share/dwarftherapist/memory_layouts/linux
recreate_dir() {
rm "$out/$1"
mkdir -p "$out/$1"
for i in "${dt}/$1/"*; do
ln -s "$i" "$out/$1"
done
}
recreate_dir share
recreate_dir share/dwarftherapist
mkdir -p $out/share/dwarftherapist/memory_layouts/linux mkdir -p $out/share/dwarftherapist/memory_layouts/linux
origmd5=$(cat "${dfHashFile}.orig" | cut -c1-8) origmd5=$(cat "${dfHashFile}.orig" | cut -c1-8)
patchedmd5=$(cat "${dfHashFile}" | cut -c1-8) patchedmd5=$(cat "${dfHashFile}" | cut -c1-8)