diff options
author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2012-02-26 20:06:01 +0000 |
---|---|---|
committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2012-02-26 20:06:01 +0000 |
commit | cb5bbe00fe265cd74ddb45bd1b3fbe7cb052d2a6 (patch) | |
tree | caf461dbd8d11c7bdd4a7852ba73dbf434d3fc52 /pkgs | |
parent | c79294e4952c4b3d3b0316ddbf0133137eae6284 (diff) | |
download | nixlib-cb5bbe00fe265cd74ddb45bd1b3fbe7cb052d2a6.tar nixlib-cb5bbe00fe265cd74ddb45bd1b3fbe7cb052d2a6.tar.gz nixlib-cb5bbe00fe265cd74ddb45bd1b3fbe7cb052d2a6.tar.bz2 nixlib-cb5bbe00fe265cd74ddb45bd1b3fbe7cb052d2a6.tar.lz nixlib-cb5bbe00fe265cd74ddb45bd1b3fbe7cb052d2a6.tar.xz nixlib-cb5bbe00fe265cd74ddb45bd1b3fbe7cb052d2a6.tar.zst nixlib-cb5bbe00fe265cd74ddb45bd1b3fbe7cb052d2a6.zip |
Adding the latest zlib, otherwise vlc does not build.
This also could be used for a newer cmake, or some trouble there was with libxml2. svn path=/nixpkgs/trunk/; revision=32598
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/libraries/zlib/latest.nix | 11 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 9 |
2 files changed, 19 insertions, 1 deletions
diff --git a/pkgs/development/libraries/zlib/latest.nix b/pkgs/development/libraries/zlib/latest.nix new file mode 100644 index 000000000000..1333c9fdfdf3 --- /dev/null +++ b/pkgs/development/libraries/zlib/latest.nix @@ -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"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 50417a72aceb..d429751bffbf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { }; |