From b4bf4327097265d855ad04f09759bd2eeb73aed1 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 18 Apr 2016 20:42:50 +0200 Subject: nghttp2: 1.8.0 -> 1.9.2, unify with libnghttp2, and use multiple outputs Note: I ignored the C++ libraries, but it appears we're not currently using them. Once we do, we'll probably want to put them in a separate output as well (to prevent non-C++ users from depending on Boost). --- pkgs/top-level/all-packages.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'pkgs/top-level') diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 57947babc1bc..3dd70f1231ad 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7536,7 +7536,9 @@ in libechonest = callPackage ../development/libraries/libechonest { }; - libev = callPackage ../development/libraries/libev { }; + libev = callPackage ../development/libraries/libev { + fetchurl = fetchurlBoot; + }; libevent = callPackage ../development/libraries/libevent { }; @@ -8276,11 +8278,10 @@ in newt = callPackage ../development/libraries/newt { }; - nghttp2 = callPackage ../development/libraries/nghttp2 { }; - libnghttp2 = self.nghttp2.override { - prefix = "lib"; + nghttp2 = callPackage ../development/libraries/nghttp2 { fetchurl = fetchurlBoot; }; + libnghttp2 = nghttp2.lib; nix-plugins = callPackage ../development/libraries/nix-plugins { nix = pkgs.nixUnstable; -- cgit 1.4.1