electricsheep: 2.6.8 -> 2.7b33 #22285
Conversation
nand0p
commented
Jan 30, 2017
nand0p
commented
- Updates and fixes currently broken package.
- Provides Flam3 and GLee dependencies.
- Tested on Nixos Unstable.
nand0p
force-pushed
the
electricsheep
branch
2 times, most recently
from
fa6bd47
to
fa1957c
Compare
nand0p
force-pushed
the
electricsheep
branch
2 times, most recently
from
1c8a0dc
to
b9cb4a0
Compare
| ''; | ||
|
|
||
| meta = with stdenv.lib; { | ||
| description = "Electric Sheep, a distributed screen saver for evolving artificial organisms."; |
There was a problem hiding this comment.
Descriptions should not end with a period.
| ]; | ||
|
|
||
| meta = with stdenv.lib; { | ||
| description = "Cosmic recursive fractal flames."; |
There was a problem hiding this comment.
Descriptions should not end with a period.
pkgs/tools/graphics/glee/default.nix
Outdated
| ''; | ||
|
|
||
| meta = with stdenv.lib; { | ||
| description = "GL Easy Extension Library."; |
There was a problem hiding this comment.
Descriptions should not end with a period.
pkgs/tools/graphics/glee/default.nix
Outdated
| }; | ||
|
|
||
| buildInputs = with pkgs; [ | ||
| cmake mesa xorg.libX11 |
There was a problem hiding this comment.
add cmake to nativeBuildInputs instead of buildInputs.
pkgs/tools/graphics/glee/default.nix
Outdated
| {stdenv, fetchgit, pkgs}: | ||
|
|
||
| stdenv.mkDerivation rec { | ||
| name = "glee"; |
There was a problem hiding this comment.
The name should contain a version. If you refer to an unreleased commit use the time stamp of that commit.
| }; | ||
|
|
||
| buildInputs = [pkgconfig expat zlib libpng libjpeg xorg.xlibsWrapper xorg.libXv]; | ||
| buildInputs = with pkgs; [ | ||
| autoconf automake libtool wxGTK30 libav lua5_1 pkgconfig curl libpng xorg.libXrender |
There was a problem hiding this comment.
Instead of adding autoconf and automake and calling ./autogen.sh you can just use the autoreconfHook.
|
@pSub looks like im getting this on using autoreconfHook:
i left it commented in code to show how this was generated. |
| }; | ||
|
|
||
| buildInputs = [pkgconfig expat zlib libpng libjpeg xorg.xlibsWrapper xorg.libXv]; | ||
| #nativeBuildInputs = [ autoreconfHook ]; |
There was a problem hiding this comment.
currently, i am running ./autogen.sh in configurePhase manually, as autoreconfHook is giving me the following error:
./configure: line 18537: syntax error near unexpected token PTHREAD_OK=true,PTHREAD_OK=false'
./configure: line 18537:ACX_PTHREAD(PTHREAD_OK=true,PTHREAD_OK=false)'
im not sure about this error, or if im missing something when invoking autoreconfHook ?
It works correctly as is manually, without invoking autoreconfHook. i left it commented to show this, as hopefully there is an obvious fix?
| src = fetchurl { | ||
| url = "http://electricsheep.org/${name}.tar.gz"; | ||
| sha256 = "1flqcqfs75wg74hr5w85n6w8b26l4qrpwzi7fzylnry67yzf94y5"; | ||
| src = fetchgit { |
There was a problem hiding this comment.
I'd use fetchFromGitHub here and in the other one, which is quite a bit more efficient, especially for big repos.
| ''; | ||
|
|
||
| preInstall = '' | ||
| sed -i 's/readme/Readme/' cmake_install.cmake |
There was a problem hiding this comment.
it looks for a file named "readme" and breaks if it cannot find it, so i change the filename it looks for to make it work.
There was a problem hiding this comment.
Do other folks run it on a case-insensitive filesystem or something? Seems weird, but makes sense
| ]; | ||
|
|
||
| preBuild = '' | ||
| sed -i 's|/usr|$out|' Makefile |
There was a problem hiding this comment.
will this get substituted in properly? I'd expect double quotes here, but I can't remember if make expands env vars inside makefiles
There was a problem hiding this comment.
it is working, but i will fix to follow convention.
|
@pSub @copumpkin this is now updated and working with |
- Updates and fixes currently broken package. - Provides Flam3 and GLee dependencies. - Tested on Nixos Unstable.
Also some cleanups like removed unused buildInputs.
