public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix eval after #11248

Browse Source
This commit is contained in:
Domen Kožar 2015-11-25 10:58:10 +01:00
parent 344e96fe0e
commit d15d1a49be
2 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/games/soi/default.nix
View File

@ -2,17 +2,17 @@
let let
baseName = "soi"; baseName = "soi";
fileName = "Spheres%20of%20Influence";
majorVersion = "0.1"; majorVersion = "0.1";
minorVersion = "1"; minorVersion = "1";
version = "${majorVersion}.${minorVersion}"; version = "${majorVersion}.${minorVersion}";
name = "${baseName}-${version}"; name = "${baseName}-${version}";
project = "${baseName}";
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
inherit name;
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/project/${project}/${baseName}-${majorVersion}/${fileName}-${version}-Source.tar.gz"; url = "mirror://sourceforge/project/${baseName}/${baseName}-${majorVersion}/Spheres%20of%20Influence-${version}-Source.tar.gz";
inherit name;
sha256 = "dfc59319d2962033709bb751c71728417888addc6c32cbec3da9679087732a81"; sha256 = "dfc59319d2962033709bb751c71728417888addc6c32cbec3da9679087732a81";
}; };
@ -22,13 +22,10 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "A physics-based puzzle game"; description = "A physics-based puzzle game";
maintainers = with maintainers; maintainers = with maintainers; [ raskin ];
[
raskin
];
platforms = platforms.linux; platforms = platforms.linux;
license = licenses.free; license = licenses.free;
broken = true; broken = true;
downloadPage = "http://sourceforge.net/projects/soi/files/"; downloadPage = "http://sourceforge.net/projects/soi/files/";
}; };
} }

10
pkgs/top-level/all-packages.nix
View File

@ -3343,7 +3343,7 @@ let
vnc2flv = callPackage ../tools/video/vnc2flv {}; vnc2flv = callPackage ../tools/video/vnc2flv {};
vncrec = callPackage ../tools/video/vncrec { vncrec = callPackage ../tools/video/vncrec {
inherit (xlibs) imake libX11 xproto gccmakedep libXt inherit (xorg) imake libX11 xproto gccmakedep libXt
libXmu libXaw libXext xextproto libSM libICE libXpm libXmu libXaw libXext xextproto libSM libICE libXpm
libXp; libXp;
}; };
@ -6359,7 +6359,7 @@ let
freeglut = callPackage ../development/libraries/freeglut { }; freeglut = callPackage ../development/libraries/freeglut { };
freenect = callPackage ../development/libraries/freenect { freenect = callPackage ../development/libraries/freenect {
inherit (xlibs) libXi libXmu; inherit (xorg) libXi libXmu;
}; };
freetype = callPackage ../development/libraries/freetype { }; freetype = callPackage ../development/libraries/freetype { };
@ -9747,7 +9747,7 @@ let
dietlibc = callPackage ../os-specific/linux/dietlibc { }; dietlibc = callPackage ../os-specific/linux/dietlibc { };
directvnc = callPackage ../os-specific/linux/directvnc { directvnc = callPackage ../os-specific/linux/directvnc {
inherit (xlibs) xproto; inherit (xorg) xproto;
}; };
dmraid = callPackage ../os-specific/linux/dmraid { dmraid = callPackage ../os-specific/linux/dmraid {
@ -13569,7 +13569,7 @@ let
x42-plugins = callPackage ../applications/audio/x42-plugins { }; x42-plugins = callPackage ../applications/audio/x42-plugins { };
xaos = callPackage ../applications/graphics/xaos { xaos = callPackage ../applications/graphics/xaos {
inherit (xlibs) libXt libX11 libXext xextproto xproto; inherit (xorg) libXt libX11 libXext xextproto xproto;
libpng = libpng12; libpng = libpng12;
}; };
@ -14300,7 +14300,7 @@ let
xsnow = callPackage ../games/xsnow { }; xsnow = callPackage ../games/xsnow { };
xsokoban = callPackage ../games/xsokoban { xsokoban = callPackage ../games/xsokoban {
inherit (xlibs) libX11 xproto libXpm libXt; inherit (xorg) libX11 xproto libXpm libXt;
}; };
zandronum = callPackage ../games/zandronum { }; zandronum = callPackage ../games/zandronum { };