tbe: migrate to pkgs/by-name and modernize derivation (#460821)

This commit is contained in:
7c6f434c
2025-11-12 06:25:34 +00:00
committed by GitHub
2 changed files with 15 additions and 17 deletions

View File

@@ -1,23 +1,20 @@
{ {
lib, lib,
mkDerivation, stdenv,
fetchFromGitHub, fetchFromGitHub,
cmake, cmake,
qttools, libsForQt5,
wrapQtAppsHook,
qtbase,
qtsvg,
}: }:
mkDerivation rec { stdenv.mkDerivation (finalAttrs: {
pname = "tbe"; pname = "tbe";
version = "0.9.3.1"; version = "0.9.3.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "kaa-ching"; owner = "kaa-ching";
repo = "tbe"; repo = "tbe";
tag = "v${version}"; tag = "v${finalAttrs.version}";
sha256 = "1ag2cp346f9bz9qy6za6q54id44d2ypvkyhvnjha14qzzapwaysj"; hash = "sha256-UnvFr/ofk6CgtBv6ua8XjZAWScFGfeNx+is5Q8Zl4qk=";
}; };
postPatch = '' postPatch = ''
@@ -34,10 +31,13 @@ mkDerivation rec {
nativeBuildInputs = [ nativeBuildInputs = [
cmake cmake
]
++ (with libsForQt5; [
qttools qttools
wrapQtAppsHook wrapQtAppsHook
]; ]);
buildInputs = [
buildInputs = with libsForQt5; [
qtbase qtbase
qtsvg qtsvg
]; ];
@@ -50,12 +50,12 @@ mkDerivation rec {
cp -r ../usr/share $out/ cp -r ../usr/share $out/
''; '';
meta = with lib; { meta = {
description = "Physics-based game vaguely similar to Incredible Machine"; description = "Physics-based game vaguely similar to Incredible Machine";
mainProgram = "tbe"; mainProgram = "tbe";
homepage = "http://the-butterfly-effect.org/"; homepage = "http://the-butterfly-effect.org/";
maintainers = [ maintainers.raskin ]; maintainers = with lib.maintainers; [ raskin ];
platforms = platforms.linux; platforms = lib.platforms.linux;
license = licenses.gpl2Only; license = lib.licenses.gpl2Only;
}; };
} })

View File

@@ -13195,8 +13195,6 @@ with pkgs;
lua = lua5_2; lua = lua5_2;
}; };
tbe = libsForQt5.callPackage ../games/the-butterfly-effect { };
teeworlds-server = teeworlds.override { buildClient = false; }; teeworlds-server = teeworlds.override { buildClient = false; };
tengine = callPackage ../servers/http/tengine { tengine = callPackage ../servers/http/tengine {