Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: d7c23cc65f94
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: ebcfdf5eb0ae
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Mar 8, 2019

  1. xteddy: init at 2.2 (#57057)

    @xaverdh @xeji
    xaverdh authored and xeji committed Mar 8, 2019
    Copy the full SHA
    ebcfdf5 View commit details
Showing with 42 additions and 0 deletions.
  1. +40 −0 pkgs/applications/misc/xteddy/default.nix
  2. +2 −0 pkgs/top-level/all-packages.nix
40 changes: 40 additions & 0 deletions pkgs/applications/misc/xteddy/default.nix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
{ stdenv, fetchzip, 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";
};
nativeBuildInputs = [ pkg-config makeWrapper ];
buildInputs = [ imlib2 xorg.libX11 xorg.libXext ];

makeFlags = [ "LIBS=-lXext" ];

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
'';

postInstall = ''
cp -R images $out/share/images
# remove broken test script
rm $out/bin/xteddy_test
'';

postFixup = ''
# this is needed, because xteddy expects images to reside
# in the current working directory
wrapProgram $out/bin/xteddy --run "cd $out/share/images/"
'';

meta = with stdenv.lib; {
description = "Cuddly teddy bear for your X desktop";
homepage = https://weber.itn.liu.se/~stegu/xteddy/;
license = licenses.gpl2;
maintainers = [ maintainers.xaverdh ];
platforms = platforms.linux;
};
}
2 changes: 2 additions & 0 deletions pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -23128,6 +23128,8 @@ in
SDL = SDL_sixel;
};

xteddy = callPackage ../applications/misc/xteddy { };

xwiimote = callPackage ../misc/drivers/xwiimote {
bluez = pkgs.bluez5.override {
enableWiimote = true;