Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

edgar updates #254584

Merged
merged 3 commits into from
Sep 11, 2023
Merged

edgar updates #254584

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4e8e9c0
the-legend-of-edgar: disable fortify flag
AndersonTorres Sep 11, 2023
5283e02
the-legend-of-edgar: 1.36 -> 1.36-unstable-2023-07-11
AndersonTorres Sep 11, 2023
d8ad05e
the-legend-of-edgar: migrate to by-name
AndersonTorres Sep 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 13 additions & 15 deletions pkgs/games/the-legend-of-edgar/default.nix → ...y-name/th/the-legend-of-edgar/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,15 @@
, zlib
}:

stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "the-legend-of-edgar";
version = "1.36";
version = "1.36-unstable-2023-07-11";

src = fetchFromGitHub {
name = "${pname}-${version}-src";
owner = "riksweeney";
repo = "edgar";
rev = version;
hash = "sha256-u2mg4hpcjPXzuZjYKIC4lgqGJPFRB9baHvaiu/YafZw=";
rev = "8344b385b65e8226455c7e88bd5aca57caa3c520";
hash = "sha256-dOLKMsyQkVZ7gBiURfr/tFbu3xSqei8A/M2HSZgAFnI=";
};

nativeBuildInputs = [
Expand All @@ -46,13 +45,11 @@ stdenv.mkDerivation rec {
"BIN_DIR=${placeholder "out"}/bin/"
];

# TODO: remove the setting below when the next version arrives
# https://github.com/riksweeney/edgar/pull/57
preBuild = ''
export CFLAGS=$(sdl2-config --cflags)
'';
hardeningDisable = [
"fortify"
];

meta = with lib; {
meta = {
homepage = "https://www.parallelrealities.co.uk/games/edgar";
description = "A 2D platform game with a persistent world";
longDescription = ''
Expand All @@ -67,9 +64,10 @@ stdenv.mkDerivation rec {
Amiga and SNES. Edgar must battle his way across the world, solving
puzzles and defeating powerful enemies to achieve his quest.
'';
license = licenses.gpl1Plus;
maintainers = with maintainers; [ AndersonTorres ];
platforms = platforms.unix;
license = lib.licenses.gpl1Plus;
mainProgram = "edgar";
maintainers = with lib.maintainers; [ AndersonTorres ];
platforms = lib.platforms.unix;
broken = stdenv.isDarwin;
};
}
})
2 changes: 0 additions & 2 deletions pkgs/top-level/all-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38620,8 +38620,6 @@ with pkgs;

tcl2048 = callPackage ../games/tcl2048 { };

the-legend-of-edgar = callPackage ../games/the-legend-of-edgar { };

the-powder-toy = callPackage ../games/the-powder-toy {
lua = lua5_1;
inherit (darwin.apple_sdk.frameworks) Cocoa;
Expand Down