diff options
| author | Tobias Hammerschmidt <tobias.hammerschmidt@gmx.de> | 2008-03-10 13:09:47 +0000 |
|---|---|---|
| committer | Tobias Hammerschmidt <tobias.hammerschmidt@gmx.de> | 2008-03-10 13:09:47 +0000 |
| commit | 8c5c656fb57a3483f5aff47c52786e0b8f9395ca (patch) | |
| tree | 11ff7eae51a7c3c582c6138f72726b98c3e1c19d | |
| parent | 7c7639a888d5129ac202b57ff857ed5d076f0533 (diff) | |
| download | nixlib-8c5c656fb57a3483f5aff47c52786e0b8f9395ca.tar nixlib-8c5c656fb57a3483f5aff47c52786e0b8f9395ca.tar.gz nixlib-8c5c656fb57a3483f5aff47c52786e0b8f9395ca.tar.bz2 nixlib-8c5c656fb57a3483f5aff47c52786e0b8f9395ca.tar.lz nixlib-8c5c656fb57a3483f5aff47c52786e0b8f9395ca.tar.xz nixlib-8c5c656fb57a3483f5aff47c52786e0b8f9395ca.tar.zst nixlib-8c5c656fb57a3483f5aff47c52786e0b8f9395ca.zip | |
fixed skype, wesnoth updated to version 1.4
svn path=/nixpkgs/trunk/; revision=11033
| -rw-r--r-- | pkgs/applications/networking/skype/default.nix | 34 | ||||
| -rw-r--r-- | pkgs/games/wesnoth/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
3 files changed, 29 insertions, 11 deletions
diff --git a/pkgs/applications/networking/skype/default.nix b/pkgs/applications/networking/skype/default.nix index 285cba82a3fe..25ab4f77d849 100644 --- a/pkgs/applications/networking/skype/default.nix +++ b/pkgs/applications/networking/skype/default.nix @@ -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"; }; -} +}) diff --git a/pkgs/games/wesnoth/default.nix b/pkgs/games/wesnoth/default.nix index 2e132dd88899..20469dcea37d 100644 --- a/pkgs/games/wesnoth/default.nix +++ b/pkgs/games/wesnoth/default.nix @@ -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]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1f9c397fe16e..47f6950cbb27 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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; }; |