Merge branch 'nitrogen' of github.com:/auntieNeo/nixpkgs into nitrogen
Conflicts: pkgs/tools/X11/nitrogen/default.nix
This commit is contained in:
commit
c977673bb5
2
pkgs/games/typespeed/builder.sh
Normal file
2
pkgs/games/typespeed/builder.sh
Normal file
|
@ -0,0 +1,2 @@
|
|||
source $stdenv/setup
|
||||
genericBuild
|
12
pkgs/games/typespeed/default.nix
Normal file
12
pkgs/games/typespeed/default.nix
Normal 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";
|
||||
};
|
||||
}
|
|
@ -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";
|
||||
|
|
Loading…
Reference in a new issue