b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

sgtpuzzles: 20200610.9aa7b7c -> 20220613.387d323

Browse source 
This required moving to sgtpuzzle's cmake-based build:
https://git.tartarus.org/?p=simon/puzzles.git;a=commit;h=cc7f5503dc8f4ddf468e080a73028c83d1196e83

Tested by compiling and playing some games on x86_64.
This commit is contained in:
Tom Fitzhenry 2022-07-18 22:20:28 +10:00
parent 34aa48f578
commit 61bf2a9c68
1 changed files with 12 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
pkgs/games/sgt-puzzles/default.nix
View file

@ -1,15 +1,15 @@
{ lib, stdenv, fetchurl, desktop-file-utils
, gtk3, libX11
, makeWrapper, pkg-config, perl, autoreconfHook, wrapGAppsHook
, gtk3, libX11, cmake, imagemagick
, pkg-config, perl, wrapGAppsHook
}:
stdenv.mkDerivation rec {
pname = "sgt-puzzles";
version = "20200610.9aa7b7c";
version = "20220613.387d323";
src = fetchurl {
url = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${version}.tar.gz";
sha256 = "0rrd1c77ar91zqy4rr4xp1z7x3ywnshlac99cga4hnrgwb7vwl3f";
hash = "sha256-Vcm7gxC9R7vvLkgkHblvEOONGLkYSHGMRfSBktgN/oQ=";
};
sgt-puzzles-menu = fetchurl {
@ -17,18 +17,17 @@ stdenv.mkDerivation rec {
sha256 = "088w0x9g3j8pn725ix8ny8knhdsfgjr3hpswsh9fvfkz5vlg2xkm";
};
nativeBuildInputs = [ autoreconfHook desktop-file-utils makeWrapper
pkg-config perl wrapGAppsHook ];
nativeBuildInputs = [
cmake
desktop-file-utils
imagemagick
perl
pkg-config
wrapGAppsHook
];
buildInputs = [ gtk3 libX11 ];
makeFlags = [ "prefix=$(out)" "gamesdir=$(out)/bin"];
preInstall = ''
mkdir -p "$out"/{bin,share/doc/sgtpuzzles}
cp gamedesc.txt LICENCE README "$out/share/doc/sgtpuzzles"
'';
postInstall = ''
for i in $(basename -s $out/bin/*); do
@ -57,12 +56,6 @@ stdenv.mkDerivation rec {
install -Dm644 ${sgt-puzzles-menu} -t $out/etc/xdg/menus/applications-merged/
'';
preConfigure = ''
perl mkfiles.pl
export NIX_LDFLAGS="$NIX_LDFLAGS -lX11"
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -Wno-error"
cp Makefile.gtk Makefile
'';
meta = with lib; {
description = "Simon Tatham's portable puzzle collection";
license = licenses.mit;