ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-11 15:27:20 +03:00
Code Issues Projects Releases Wiki Activity

Adding the latest zlib, otherwise vlc does not build.

Browse Source 
This also could be used for a newer cmake, or some trouble there was with libxml2.


svn path=/nixpkgs/trunk/; revision=32598
This commit is contained in:
Lluís Batlle i Rossell 2012-02-26 20:06:01 +00:00
parent c79294e495
commit cb5bbe00fe
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/development/libraries/zlib/latest.nix Normal file
View File

@ -0,0 +1,11 @@
{stdenv, fetchurl}:
# To be removed in stdenv-updates, as default.nix is already right there.
stdenv.mkDerivation rec {
name = "zlib-1.2.6";
src = fetchurl {
url = "http://www.zlib.net/${name}.tar.gz";
sha256 = "06x6m33ls1606ni7275q5z392csvh18dgs55kshfnvrfal45w8r1";
};
}

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

@ -4845,6 +4845,9 @@ let
fetchurl = fetchurlBoot;
};
# To be removed in stdenv-updates; zlib is already fixed and the latest there
zlib_latest = callPackage ../development/libraries/zlib/latest.nix { };
zlibStatic = lowPrio (appendToName "static" (import ../development/libraries/zlib {
inherit fetchurl stdenv;
static = true;
@ -7633,7 +7636,11 @@ let
inherit (xlibs) libX11;
};
vlc = callPackage ../applications/video/vlc { };
vlc = callPackage ../applications/video/vlc {
# To be removed on stdenv-updates. It fails on i686-linux with
# the stdenv zlib.
zlib = zlib_latest;
};
vnstat = callPackage ../applications/networking/vnstat { };