diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-04-04 00:02:45 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-04 00:02:45 +0000 |
| commit | c9154e5e14918154579fd767b4098eb213c97c5f (patch) | |
| tree | 507877de83b4681a805f2a2d39b24270445723bf /pkgs/games | |
| parent | f95a3d11401f6470ec4ac001793b612c0243ca9b (diff) | |
| parent | bb7e4b378eef257335d91ae507d5123c4c770497 (diff) | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/games')
| -rw-r--r-- | pkgs/games/liberation-circuit/default.nix | 39 |
1 files changed, 5 insertions, 34 deletions
diff --git a/pkgs/games/liberation-circuit/default.nix b/pkgs/games/liberation-circuit/default.nix index c1f03e036c9fe..365fbb2983eb0 100644 --- a/pkgs/games/liberation-circuit/default.nix +++ b/pkgs/games/liberation-circuit/default.nix @@ -1,52 +1,23 @@ -{ stdenv, lib, fetchFromGitHub, fetchurl, cmake, git, makeWrapper, allegro5, libGL }: +{ stdenv, lib, fetchFromGitHub, fetchurl, pkg-config, makeWrapper, allegro5, libGL }: stdenv.mkDerivation rec { pname = "liberation-circuit"; - version = "1.3"; + version = "unstable-2022-01-02"; src = fetchFromGitHub { owner = "linleyh"; repo = pname; - rev = "v${version}"; - sha256 = "BAv0wEJw4pK77jV+1bWPHeqyU/u0HtZLBF3ETUoQEAk="; + rev = "19e3363547793e931fd9419b61ebc2cd8e257714"; + sha256 = "zIwjh4CBSmKz7pF7GM5af+VslWho5jHOLsulbW4C8TY="; }; - patches = [ - # Linux packaging assets - (fetchurl { - url = "https://github.com/linleyh/liberation-circuit/commit/72c1f6f4100bd227540aca14a535e7f4ebdeb851.patch"; - sha256 = "0sad1z1lls0hanv88g1q6x5qr4s8f5p42s8j8v55bmwsdc0s5qys"; - }) - ]; - - # Hack to make binary diffs work - prePatch = '' - function patch { - git apply --whitespace=nowarn "$@" - } - ''; - - postPatch = '' - unset -f patch - substituteInPlace bin/launcher.sh --replace ./libcirc ./liberation-circuit - ''; - - nativeBuildInputs = [ cmake git makeWrapper ]; + nativeBuildInputs = [ pkg-config makeWrapper ]; buildInputs = [ allegro5 libGL ]; - cmakeFlags = [ - "-DALLEGRO_LIBRARY=${lib.getDev allegro5}" - "-DALLEGRO_INCLUDE_DIR=${lib.getDev allegro5}/include" - ]; - - NIX_CFLAGS_LINK = "-lallegro_image -lallegro_primitives -lallegro_color -lallegro_acodec -lallegro_audio -lallegro_dialog -lallegro_font -lallegro_main -lallegro -lm"; - hardeningDisable = [ "format" ]; - installPhase = '' runHook preInstall mkdir -p $out/opt - cd .. cp -r bin $out/opt/liberation-circuit chmod +x $out/opt/liberation-circuit/launcher.sh makeWrapper $out/opt/liberation-circuit/launcher.sh $out/bin/liberation-circuit |