public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pentobi: 18.1 -> 18.3 

* Rewrite without stdenv and wrapQtAppsHook
 * Fetch source from GithHub
This commit is contained in:
freezeboy 2020-11-05 18:19:38 +01:00
parent 8e375d71f0
commit 9290417300
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
pkgs/games/pentobi/default.nix
View File

@ -1,20 +1,20 @@
{ stdenv, appstream, fetchurl, cmake, gettext, libxslt, librsvg, itstool { lib, mkDerivation, appstream, fetchFromGitHub, cmake, gettext, libxslt, librsvg, itstool
, qtbase, qtquickcontrols2, qtsvg, qttools, qtwebview, docbook_xsl , qtbase, qtquickcontrols2, qtsvg, qttools, qtwebview, docbook_xsl
, wrapQtAppsHook
}: }:
with stdenv.lib; mkDerivation rec {
stdenv.mkDerivation rec { version = "18.3";
version = "18.1";
pname = "pentobi"; pname = "pentobi";
src = fetchurl { src = fetchFromGitHub {
url = "mirror://sourceforge/pentobi/${pname}-${version}.tar.xz"; owner = "enz";
sha256 = "1vfw61lk9z7dngncmx3fggy5ld7ksdk48dpwnsq2vl5fh3f71qbq"; repo = "pentobi";
rev = "v${version}";
sha256 = "9AymvAlXi0zkkcakTR0mC4gmyrweZR4EwlhORkmVshw=";
}; };
nativeBuildInputs = [ cmake docbook_xsl wrapQtAppsHook ]; nativeBuildInputs = [ cmake docbook_xsl qttools ];
buildInputs = [ appstream qtbase qtsvg qtquickcontrols2 qttools qtwebview itstool librsvg ]; buildInputs = [ appstream qtbase qtsvg qtquickcontrols2 qtwebview itstool librsvg ];
patchPhase = '' patchPhase = ''
substituteInPlace pentobi_thumbnailer/CMakeLists.txt --replace "/manpages" "/share/xml/docbook-xsl/manpages/" substituteInPlace pentobi_thumbnailer/CMakeLists.txt --replace "/manpages" "/share/xml/docbook-xsl/manpages/"
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
"-DMETAINFO_ITS=${appstream}/share/gettext/its/metainfo.its" "-DMETAINFO_ITS=${appstream}/share/gettext/its/metainfo.its"
]; ];
meta = { meta = with lib; {
description = "A computer opponent for the board game Blokus"; description = "A computer opponent for the board game Blokus";
homepage = "https://pentobi.sourceforge.io"; homepage = "https://pentobi.sourceforge.io";
license = licenses.gpl3; license = licenses.gpl3;

2
pkgs/top-level/all-packages.nix
View File

@ -25601,7 +25601,7 @@ in
papermc = callPackage ../games/papermc { }; papermc = callPackage ../games/papermc { };
pentobi = libsForQt514.callPackage ../games/pentobi { }; pentobi = libsForQt5.callPackage ../games/pentobi { };
performous = callPackage ../games/performous { performous = callPackage ../games/performous {
boost = boost166; boost = boost166;