b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge branch 'nitrogen' of github.com:/auntieNeo/nixpkgs into nitrogen

Browse source 
Conflicts:
	pkgs/tools/X11/nitrogen/default.nix
This commit is contained in:
Jonathan Glines 2014-06-13 11:41:40 -06:00
parent c55be95e6e 8af05e82a0
commit c977673bb5
3 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/games/typespeed/builder.sh Normal file
View file

@ -0,0 +1,2 @@
source $stdenv/setup
genericBuild

12
pkgs/games/typespeed/default.nix Normal file
View file

@ -0,0 +1,12 @@
{ stdenv, fetchurl, ncurses }:
stdenv.mkDerivation {
name = "typespeed-0.6.5";
builder = ./builder.sh;
buildInputs = [ ncurses ];
configureFlags = "--with-highscoredir=/tmp";
src = fetchurl {
url = http://typespeed.sourceforge.net/typespeed-0.6.5.tar.gz;
sha256 = "5c860385ceed8a60f13217cc0192c4c2b4705c3e80f9866f7d72ff306eb72961";
};
}

1
pkgs/tools/X11/nitrogen/default.nix
View file

@ -7,7 +7,6 @@ stdenv.mkDerivation rec {
url = "http://projects.l3ib.org/nitrogen/files/nitrogen-1.5.2.tar.gz";
sha256 = "60a2437ce6a6c0ba44505fc8066c1973140d4bb48e1e5649f525c7b0b8bf9fd2";
};
buildInputs = [ glib gtk2 gtkmm pkgconfig ];
NIX_LDFLAGS = "-lX11";