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

Merge pull request #65797 from xaverdh/xteddy-2.2-5

Browse Source 
xteddy: 2.2 -> 2.2-5 (use debian sources and patches)
This commit is contained in:
Marek Mahut 2019-08-03 17:33:47 +02:00 committed by GitHub
commit c550690c7b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pkgs/applications/misc/xteddy/default.nix
View File

@ -1,19 +1,22 @@
{ stdenv, fetchzip, pkg-config, xorg, imlib2, makeWrapper }:
{ stdenv, fetchFromGitLab, pkg-config, xorg, imlib2, makeWrapper }:
stdenv.mkDerivation rec {
name = "xteddy-${version}";
version = "2.2";
src = fetchzip {
url = "https://deb.debian.org/debian/pool/main/x/xteddy/xteddy_${version}.orig.tar.gz";
sha256 = "0sap4fqvs0888ymf5ga10p3n7n5kr35j38kfsfd7nj0xm4hmcma3";
version = "2.2-5";
src = fetchFromGitLab {
domain = "salsa.debian.org";
owner = "games-team";
repo = "xteddy";
rev = "debian%2F${version}"; # %2F = urlquote("/");
sha256 = "0rm7w78d6qajq4fvi4agyqm0c70f3c1i0cy2jdb6kqql2k8w78qy";
};
nativeBuildInputs = [ pkg-config makeWrapper ];
buildInputs = [ imlib2 xorg.libX11 xorg.libXext ];
makeFlags = [ "LIBS=-lXext" ];
patches = [ "${src}/debian/patches/10_libXext.patch" "${src}/debian/patches/wrong-man-page-section.patch" ];
postPatch = ''
sed -i 's/man 1 xteddy/man 6 xteddy/' xteddy.c
sed -i "s:/usr/games/xteddy:$out/bin/xteddy:" xtoys
sed -i "s:/usr/share/xteddy:$out/share/xteddy:" xtoys
'';
@ -32,7 +35,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Cuddly teddy bear for your X desktop";
homepage = https://weber.itn.liu.se/~stegu/xteddy/;
homepage = "https://weber.itn.liu.se/~stegu/xteddy/";
license = licenses.gpl2;
maintainers = [ maintainers.xaverdh ];
platforms = platforms.linux;