diff options
| author | Dominik Xaver Hörl <hoe.dom@gmx.de> | 2019-08-02 17:10:39 +0200 |
|---|---|---|
| committer | Dominik Xaver Hörl <hoe.dom@gmx.de> | 2019-08-03 00:33:27 +0200 |
| commit | 0172a27043e6d1b3169ba5cdb658113186ff4fef (patch) | |
| tree | 49c7431e4ee5e4f293e97e555343162f35d93f1e /pkgs/applications/misc/xteddy | |
| parent | a8d45e7fc3656895fc26ff334055a8a27327f96f (diff) | |
| download | nixpkgs-0172a27043e6d1b3169ba5cdb658113186ff4fef.tar nixpkgs-0172a27043e6d1b3169ba5cdb658113186ff4fef.tar.gz nixpkgs-0172a27043e6d1b3169ba5cdb658113186ff4fef.tar.bz2 nixpkgs-0172a27043e6d1b3169ba5cdb658113186ff4fef.tar.lz nixpkgs-0172a27043e6d1b3169ba5cdb658113186ff4fef.tar.xz nixpkgs-0172a27043e6d1b3169ba5cdb658113186ff4fef.tar.zst nixpkgs-0172a27043e6d1b3169ba5cdb658113186ff4fef.zip | |
xteddy: 2.2 -> 2.2-5 (use debian sources and patches)
Diffstat (limited to 'pkgs/applications/misc/xteddy')
| -rw-r--r-- | pkgs/applications/misc/xteddy/default.nix | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/pkgs/applications/misc/xteddy/default.nix b/pkgs/applications/misc/xteddy/default.nix index 6f67ed96c57..6bc492833cc 100644 --- a/pkgs/applications/misc/xteddy/default.nix +++ b/pkgs/applications/misc/xteddy/default.nix @@ -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; |