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

fixed skype, wesnoth updated to version 1.4

Browse Source 
svn path=/nixpkgs/trunk/; revision=11033
This commit is contained in:
Tobias Hammerschmidt 2008-03-10 13:09:47 +00:00
parent 7c7639a888
commit 8c5c656fb5
3 changed files with 29 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
pkgs/applications/networking/skype/default.nix
View File

@ -1,18 +1,36 @@
args: with args; args: with args;
stdenv.mkDerivation { stdenv.mkDerivation ( rec {
pname = "skype";
version = "1.4.0.118";
name = "skype-1.4"; name = "skype-1.4";
src = fetchurl { src = fetchurl {
url = http://www.skype.com/go/getskype-linux-static; url = http://www.skype.com/go/getskype-linux-static;
sha256 = "0k71byzaipmw8lb92aad4qyh9rk0fnn3za74v1h268h09gkkd8mz"; sha256 = "1293f54811a36b2a1b83c56a4ad2844e58c753fe39b61422fac66b001d0f9e0c";
name = "skype_static-1.4.0.99.tar.bz2"; name = "${pname}_static-${version}.tar.bz2";
}; };
buildInputs = [alsaLib glibc libSM libICE libXi libXrender libXrandr libXfixes buildInputs = [
libXcursor libXinerama freetype fontconfig libXext libX11 alsaLib
fontconfig libXinerama libsigcxx gcc41.gcc ]; glibc
gcc.gcc
libSM
libICE
libXi
libXrender
libXrandr
libXfixes
libXcursor
libXinerama
freetype
fontconfig
libXext
libX11
fontconfig
libsigcxx
];
phases = "installPhase"; phases = "unpackPhase installPhase";
installPhase =" installPhase ="
ensureDir \$out/{opt/skype/,bin}; ensureDir \$out/{opt/skype/,bin};
@ -41,4 +59,4 @@ done
homepage = http://www.skype.com; homepage = http://www.skype.com;
license = "skype-eula"; license = "skype-eula";
}; };
} })

4
pkgs/games/wesnoth/default.nix
View File

@ -1,13 +1,13 @@
args: with args; args: with args;
stdenv.mkDerivation (rec { stdenv.mkDerivation (rec {
pname = "wesnoth"; pname = "wesnoth";
version = "1.3.18"; version = "1.4";
name = "${pname}-${version}"; name = "${pname}-${version}";
src = fetchurl { src = fetchurl {
url = "http://surfnet.dl.sourceforge.net/sourceforge/${pname}/${name}.tar.bz2"; url = "http://surfnet.dl.sourceforge.net/sourceforge/${pname}/${name}.tar.bz2";
sha256 = "ab2ed2cbe1daa134c453927bf0ec5d3a36f3319063b6f18c35819871f386da75"; sha256 = "67ad0509567d9496f15f1a3888c9e2001776411ffdd7007bdb8f324cdce5895d";
}; };
buildInputs = [SDL SDL_image SDL_mixer SDL_net gettext zlib boost freetype]; buildInputs = [SDL SDL_image SDL_mixer SDL_net gettext zlib boost freetype];

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

@ -5453,7 +5453,7 @@ rec {
skype_linux = import ../applications/networking/skype { skype_linux = import ../applications/networking/skype {
inherit fetchurl stdenv; inherit fetchurl stdenv;
inherit glibc alsaLib freetype fontconfig libsigcxx gcc41; inherit glibc alsaLib freetype fontconfig libsigcxx gcc;
inherit (xlibs) libSM libICE libXi libXrender libXrandr libXfixes libXcursor inherit (xlibs) libSM libICE libXi libXrender libXrandr libXfixes libXcursor
libXinerama libXext libX11; libXinerama libXext libX11;
}; };