diff --git a/pkgs/by-name/gw/gweled/package.nix b/pkgs/by-name/gw/gweled/package.nix new file mode 100644 index 000000000000..5263d9adab99 --- /dev/null +++ b/pkgs/by-name/gw/gweled/package.nix @@ -0,0 +1,51 @@ +{ + lib, + stdenv, + fetchgit, + meson, + ninja, + pkg-config, + wrapGAppsHook3, + desktop-file-utils, + clutter, + clutter-gtk, + gsound, + libgnome-games-support, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "gweled"; + version = "1.0-beta1"; + + src = fetchgit { + url = "https://git.launchpad.net/gweled"; + rev = "refs/tags/${finalAttrs.version}"; + hash = "sha256-cm1z6l2tfYBFVFcvsnQ6cI3pQDnJMzn6SUC20gnBF5w="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + wrapGAppsHook3 + desktop-file-utils + ]; + + buildInputs = [ + clutter + clutter-gtk + gsound + libgnome-games-support + ]; + + configureFlags = [ "--disable-setgid" ]; + + meta = { + description = "Puzzle game similar to Bejeweled or Diamond Mine"; + mainProgram = "gweled"; + homepage = "https://gweled.org"; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ aleksana ]; + }; +}) diff --git a/pkgs/games/gweled/default.nix b/pkgs/games/gweled/default.nix deleted file mode 100644 index f76085b77ddf..000000000000 --- a/pkgs/games/gweled/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ lib, stdenv, fetchbzr, gettext -, gtk2, wrapGAppsHook3, autoreconfHook, pkg-config -, libmikmod, librsvg, libcanberra-gtk2, hicolor-icon-theme }: - -stdenv.mkDerivation rec { - pname = "gweled"; - version = "unstable-2021-02-11"; - - src = fetchbzr { - url = "lp:gweled"; - rev = "108"; - hash = "sha256-rM4dgbYfSrVqZwi+xzKuEtmtjK3HVvqeutmni1vleLo="; - }; - - doCheck = false; - - postPatch = '' - substituteInPlace configure.ac --replace "AM_GNU_GETTEXT_VERSION([0.19.8])" "AM_GNU_GETTEXT_VERSION([${gettext.version}])" - ''; - - nativeBuildInputs = [ wrapGAppsHook3 gettext autoreconfHook pkg-config ]; - - buildInputs = [ gtk2 libmikmod librsvg hicolor-icon-theme libcanberra-gtk2 ]; - - configureFlags = [ "--disable-setgid" ]; - - meta = with lib; { - description = "Bejeweled clone game"; - mainProgram = "gweled"; - homepage = "https://gweled.org"; - license = licenses.gpl2Plus; - platforms = platforms.linux; - maintainers = [ ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0760f5a8bd5a..f7469e86af3e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -34655,8 +34655,6 @@ with pkgs; gtypist = callPackage ../games/gtypist { }; - gweled = callPackage ../games/gweled { }; - harmonist = callPackage ../games/harmonist { }; hase = callPackage ../games/hase { };