Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 13f0045ddc4f
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 91cb80e4397d
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Mar 20, 2019

  1. duckmarines: fix build 

    Actually updated to 1.0c. Prevent hydra from building it.

(cherry picked from commit d918001)
    @cpages
    cpages committed Mar 20, 2019
    Copy the full SHA
    91cb80e View commit details
Showing with 8 additions and 7 deletions.
  1. +7 −6 pkgs/games/duckmarines/default.nix
  2. +1 −1 pkgs/top-level/all-packages.nix
13 changes: 7 additions & 6 deletions pkgs/games/duckmarines/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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;
};
2 changes: 1 addition & 1 deletion pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -20606,7 +20606,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 { });