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

Merge pull request #97307 from unode/tdm-2.08

Browse Source 
tdm: 2.07 -> 2.08
This commit is contained in:
Lassulus 2020-09-09 09:08:20 +02:00 committed by GitHub
commit 7c39cf7121
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/games/tdm/default.nix
View File

@ -4,7 +4,7 @@
let let
pname = "tdm"; pname = "tdm";
version = "2.07"; version = "2.08";
desktop = makeDesktopItem { desktop = makeDesktopItem {
desktopName = pname; desktopName = pname;
@ -21,7 +21,7 @@ in stdenv.mkDerivation {
name = "${pname}-${version}"; name = "${pname}-${version}";
src = fetchurl { src = fetchurl {
url = "https://www.thedarkmod.com/sources/thedarkmod.${version}.src.7z"; url = "https://www.thedarkmod.com/sources/thedarkmod.${version}.src.7z";
sha256 = "17wdpip8zvm2njz0xrf7xcxl73hnsc6i83zj18kn8rnjkpy50dd6"; sha256 = "0bmv07j6s6q3m7hnpx7cwrycjkbvlf0y9sg9migakni0jg9yz5ps";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
p7zip sconsPackages.scons_3_1_2 gnum4 makeWrapper p7zip sconsPackages.scons_3_1_2 gnum4 makeWrapper
@ -39,13 +39,15 @@ in stdenv.mkDerivation {
preBuild = '' preBuild = ''
pushd tdm_update pushd tdm_update
scons BUILD=release TARGET_ARCH=x64 scons BUILD=release TARGET_ARCH=x64
install -Dm755 tdm_update.linux $out/share/libexec/tdm_update.linux install -Dm755 bin/tdm_update.linux64 $out/share/libexec/tdm_update.linux
popd popd
''; '';
# why oh why can it find ld but not strip? # why oh why can it find ld but not strip?
postPatch = '' postPatch = ''
sed -i 's!strip \$!${binutils-unwrapped}/bin/strip $!' SConstruct sed -i 's!strip \$!${binutils-unwrapped}/bin/strip $!' SConstruct
# This adds math.h needed for math::floor
sed -i 's|#include "Util.h"|#include "Util.h"\n#include <math.h>|' tdm_update/ConsoleUpdater.cpp
''; '';
installPhase = '' installPhase = ''