diff options
| author | Carles Pagès <page@ruiec.cat> | 2019-03-20 23:03:27 +0100 |
|---|---|---|
| committer | Carles Pagès <page@ruiec.cat> | 2019-03-20 23:05:37 +0100 |
| commit | d918001898da44b7fbff21e1d3f1317f34ce9324 (patch) | |
| tree | 8be5a25392d39389204e3d5b1cc812b3970d33bc | |
| parent | c1d65d680b29c613eef2a6583c11f0586416ecb9 (diff) | |
duckmarines: fix build
Actually updated to 1.0c. Prevent hydra from building it.
| -rw-r--r-- | pkgs/games/duckmarines/default.nix | 13 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 8 insertions, 7 deletions
diff --git a/pkgs/games/duckmarines/default.nix b/pkgs/games/duckmarines/default.nix index b4dca34b11fd..6da1e8ffe4b5 100644 --- a/pkgs/games/duckmarines/default.nix +++ b/pkgs/games/duckmarines/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, love, lua, makeWrapper, makeDesktopItem }: +{ stdenv, fetchurl, love, lua, makeWrapper, makeDesktopItem }: let pname = "duckmarines"; @@ -25,21 +25,21 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { - url = "https://github.com/SimonLarsen/${pname}/releases/download/v${version}/${pname}-1.0-love.zip"; - sha256 = "0fpzbsgrhbwm1lff9gyzh6c9jigw328ngddvrj5w7qmjcm2lv6lv"; + url = "https://github.com/SimonLarsen/${pname}/releases/download/v${version}/${pname}-1.0c.love"; + sha256 = "1rvgpkvi4h9zhc4fwb4knhsa789yjcx4a14fi4vqfdyybhvg5sh9"; }; - nativeBuildInputs = [ makeWrapper unzip ]; + nativeBuildInputs = [ makeWrapper ]; buildInputs = [ lua love ]; - phases = [ "unpackPhase" "installPhase" ]; + phases = [ "installPhase" ]; installPhase = '' mkdir -p $out/bin mkdir -p $out/share/games/lovegames - cp -v ./${pname}-1.0.love $out/share/games/lovegames/${pname}.love + cp -v ${src} $out/share/games/lovegames/${pname}.love makeWrapper ${love}/bin/love $out/bin/${pname} --add-flags $out/share/games/lovegames/${pname}.love @@ -52,6 +52,7 @@ stdenv.mkDerivation rec { description = "Duck-themed action puzzle video game"; maintainers = with maintainers; [ leenaars ]; platforms = platforms.linux; + hydraPlatforms = []; license = licenses.free; downloadPage = http://tangramgames.dk/games/duckmarines; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d466fe55e1f0..cffe876c0199 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20694,7 +20694,7 @@ in drumkv1 = callPackage ../applications/audio/drumkv1 { }; - duckmarines = callPackage ../games/duckmarines { love = love_0_9; }; + duckmarines = callPackage ../games/duckmarines { love = love_0_10; }; dwarf-fortress-packages = recurseIntoAttrs (callPackage ../games/dwarf-fortress { }); |