diff options
author | aszlig <aszlig@redmoonstudios.org> | 2017-09-13 08:12:08 +0200 |
---|---|---|
committer | aszlig <aszlig@redmoonstudios.org> | 2017-09-13 15:28:26 +0200 |
commit | 5b58565bf8227b9346a72844c22a733aab7b8d29 (patch) | |
tree | 16179d3650d3236d3bb1346356d7709367c51bed | |
parent | 96a14a62bfe2ab98320c8c17db88aba1506847e9 (diff) |
pkgs/games: Switch Unity games to buildUnity
Both of these games weren't working at all. Megabyte Punch was completely broken and the expression wasn't even finished and Lovers In A Dangerous Spacetime wasn't up to date (unfortunately we can't pin on a specific version). Megabyte Punch now also uses callPackage_i686, because it only comes with a 32 bit binary. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
-rw-r--r-- | pkgs/games/humblebundle/default.nix | 2 | ||||
-rw-r--r-- | pkgs/games/humblebundle/liads.nix | 40 | ||||
-rw-r--r-- | pkgs/games/humblebundle/megabytepunch.nix | 13 |
3 files changed, 10 insertions, 45 deletions
diff --git a/pkgs/games/humblebundle/default.nix b/pkgs/games/humblebundle/default.nix index c3ed1494..cbffeaa0 100644 --- a/pkgs/games/humblebundle/default.nix +++ b/pkgs/games/humblebundle/default.nix @@ -23,7 +23,7 @@ let hammerwatch = callPackage ./hammerwatch.nix {}; jamestown = callPackage ./jamestown.nix {}; liads = callPackage ./liads.nix {}; - megabytepunch = callPackage ./megabytepunch.nix {}; + megabytepunch = callPackage_i686 ./megabytepunch.nix {}; pico-8 = callPackage ./pico-8.nix {}; rocketbirds = callPackage ./rocketbirds.nix {}; spaz = callPackage ./spaz.nix {}; diff --git a/pkgs/games/humblebundle/liads.nix b/pkgs/games/humblebundle/liads.nix index 281b137d..5b79ed9e 100644 --- a/pkgs/games/humblebundle/liads.nix +++ b/pkgs/games/humblebundle/liads.nix @@ -1,43 +1,13 @@ -{ stdenv, fetchHumbleBundle, unzip, mesa, xorg, libpulseaudio }: +{ buildUnity, fetchHumbleBundle }: -stdenv.mkDerivation rec { - name = "liads-${version}"; +buildUnity { + name = "liads"; + fullName = "LoversInADangerousSpacetime"; version = "20160121"; src = fetchHumbleBundle { machineName = "loversinadangerousspacetime_linux"; suffix = "zip"; - md5 = "e838cad67e8814e955dab42efd4995e2"; + md5 = "38927a73e1fe84620ebc876f8f039adb"; }; - - unpackCmd = '' - ${unzip}/bin/unzip -qq -d liads "$src" || : - ''; - - arch = if stdenv.system == "x86_64-linux" then "x86_64" else "x86"; - executable = "LoversInADangerousSpacetime.${arch}"; - - buildPhase = let - rpath = stdenv.lib.makeLibraryPath [ - stdenv.cc.cc mesa xorg.libX11 xorg.libXcursor xorg.libXrandr libpulseaudio - ]; - in '' - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${rpath}" "$executable" - ''; - - installPhase = '' - install -vD "$executable" "$out/libexec/liads/liads" - ln -s "$out/share/liads" "$out/libexec/liads/Data" - - mkdir -p "$out/bin" - ln -s "$out/libexec/liads/liads" "$out/bin/liads" - - mkdir -p "$out/share" - cp -vRd LoversInADangerousSpacetime_Data "$out/share/liads" - ''; - - dontStrip = true; - dontPatchELF = true; } diff --git a/pkgs/games/humblebundle/megabytepunch.nix b/pkgs/games/humblebundle/megabytepunch.nix index 643e5835..9cd0a3de 100644 --- a/pkgs/games/humblebundle/megabytepunch.nix +++ b/pkgs/games/humblebundle/megabytepunch.nix @@ -1,7 +1,8 @@ -{ stdenv, fetchHumbleBundle }: +{ buildUnity, fetchHumbleBundle }: -stdenv.mkDerivation rec { - name = "megabytepunch-${version}"; +buildUnity { + name = "megabytepunch"; + fullName = "MegabytePunch"; version = "1.12"; src = fetchHumbleBundle { @@ -9,10 +10,4 @@ stdenv.mkDerivation rec { suffix = "tar.gz"; md5 = "13487ae35c99817ce5f19b45fa51158b"; }; - - patchPhase = '' - patchelf \ - --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ - - ''; } |