mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-22 15:03:28 +00:00
fixed skype, wesnoth updated to version 1.4
svn path=/nixpkgs/trunk/; revision=11033
This commit is contained in:
parent
7c7639a888
commit
8c5c656fb5
@ -1,18 +1,36 @@
|
||||
args: with args;
|
||||
stdenv.mkDerivation {
|
||||
stdenv.mkDerivation ( rec {
|
||||
pname = "skype";
|
||||
version = "1.4.0.118";
|
||||
name = "skype-1.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = http://www.skype.com/go/getskype-linux-static;
|
||||
sha256 = "0k71byzaipmw8lb92aad4qyh9rk0fnn3za74v1h268h09gkkd8mz";
|
||||
name = "skype_static-1.4.0.99.tar.bz2";
|
||||
sha256 = "1293f54811a36b2a1b83c56a4ad2844e58c753fe39b61422fac66b001d0f9e0c";
|
||||
name = "${pname}_static-${version}.tar.bz2";
|
||||
};
|
||||
|
||||
buildInputs = [alsaLib glibc libSM libICE libXi libXrender libXrandr libXfixes
|
||||
libXcursor libXinerama freetype fontconfig libXext libX11
|
||||
fontconfig libXinerama libsigcxx gcc41.gcc ];
|
||||
buildInputs = [
|
||||
alsaLib
|
||||
glibc
|
||||
gcc.gcc
|
||||
libSM
|
||||
libICE
|
||||
libXi
|
||||
libXrender
|
||||
libXrandr
|
||||
libXfixes
|
||||
libXcursor
|
||||
libXinerama
|
||||
freetype
|
||||
fontconfig
|
||||
libXext
|
||||
libX11
|
||||
fontconfig
|
||||
libsigcxx
|
||||
];
|
||||
|
||||
phases = "installPhase";
|
||||
phases = "unpackPhase installPhase";
|
||||
installPhase ="
|
||||
|
||||
ensureDir \$out/{opt/skype/,bin};
|
||||
@ -41,4 +59,4 @@ done
|
||||
homepage = http://www.skype.com;
|
||||
license = "skype-eula";
|
||||
};
|
||||
}
|
||||
})
|
||||
|
@ -1,13 +1,13 @@
|
||||
args: with args;
|
||||
stdenv.mkDerivation (rec {
|
||||
pname = "wesnoth";
|
||||
version = "1.3.18";
|
||||
version = "1.4";
|
||||
|
||||
name = "${pname}-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
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];
|
||||
|
@ -5453,7 +5453,7 @@ rec {
|
||||
|
||||
skype_linux = import ../applications/networking/skype {
|
||||
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
|
||||
libXinerama libXext libX11;
|
||||
};
|
||||
|
Loading…
Reference in New Issue
Block a user