diff options
author | Pascal Wittmann <PascalWittmann@gmx.net> | 2017-02-07 10:20:20 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-02-07 10:20:20 +0100 |
commit | 04a128540d88b9879cb2b26ac57847d02888b622 (patch) | |
tree | 088f6fbe52369bbc8cd7c466b2eb1f9895c0781c /pkgs/misc | |
parent | c73045ef1094de9323095ec3bef303a316f19a37 (diff) | |
parent | 17d74c49121478670c5842c2433d7298b8473fc7 (diff) |
Merge pull request #22285 from nand0p/electricsheep
electricsheep: 2.6.8 -> 2.7b33
Diffstat (limited to 'pkgs/misc')
-rw-r--r-- | pkgs/misc/screensavers/electricsheep/default.nix | 42 |
1 files changed, 32 insertions, 10 deletions
diff --git a/pkgs/misc/screensavers/electricsheep/default.nix b/pkgs/misc/screensavers/electricsheep/default.nix index 27e26d6d5df7..990a25591c65 100644 --- a/pkgs/misc/screensavers/electricsheep/default.nix +++ b/pkgs/misc/screensavers/electricsheep/default.nix @@ -1,22 +1,44 @@ -{stdenv, fetchurl, pkgconfig, expat, zlib, libpng, libjpeg, xorg}: +{ stdenv, fetchFromGitHub, autoreconfHook, libtool, wxGTK30, libav, lua5_1, curl, + libpng, xorg, pkgconfig, flam3, libgtop, boost, tinyxml, freeglut, mesa, glee }: stdenv.mkDerivation rec { - name = "electricsheep-2.6.8"; + name = "${pname}-${version}"; + pname = "electricsheep"; + version = "2.7b33-${stdenv.lib.strings.substring 0 7 rev}"; + rev = "598d93d90573b69559463567540aac8bc8a5b3f3"; - src = fetchurl { - url = "http://electricsheep.org/${name}.tar.gz"; - sha256 = "1flqcqfs75wg74hr5w85n6w8b26l4qrpwzi7fzylnry67yzf94y5"; + src = fetchFromGitHub { + inherit rev; + owner = "scottdraves"; + repo = "${pname}"; + sha256 = "1zcn6q0dl0ip85b8b4kisc5lqjb1cs0hpzlx4l5995l6mhq9kxis"; }; - buildInputs = [pkgconfig expat zlib libpng libjpeg xorg.xlibsWrapper xorg.libXv]; + nativeBuildInputs = [ autoreconfHook ]; - preInstall = '' - installFlags=GNOME_DATADIR=$out - mkdir -p $out/control-center/screensavers + buildInputs = [ + libtool wxGTK30 libav lua5_1 curl libpng xorg.libXrender pkgconfig + flam3 libgtop boost tinyxml freeglut mesa glee + ]; + + preAutoreconf = '' + cd client_generic + sed -i '/ACX_PTHREAD/d' configure.ac + ''; + + configureFlags = [ + "CPPFLAGS=-I${glee}/include/GL" + ]; + + preBuild = '' + sed -i "s|/usr|$out|" Makefile ''; - meta = { + meta = with stdenv.lib; { description = "Electric Sheep, a distributed screen saver for evolving artificial organisms"; homepage = http://electricsheep.org/; + maintainers = maintainers.nand0p; + platforms = platforms.linux; + license = licenses.gpl1; }; } |