From 29c02b33a95c0f6952bcc31c30dd052e74f16b1c Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Mon, 27 Dec 2021 20:52:04 +0800 Subject: [PATCH] aria2: fix cross compilation and set strictDeps --- pkgs/tools/networking/aria2/default.nix | 3 ++- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/aria2/default.nix b/pkgs/tools/networking/aria2/default.nix index db239e034f5..8fabea35ba9 100644 --- a/pkgs/tools/networking/aria2/default.nix +++ b/pkgs/tools/networking/aria2/default.nix @@ -15,6 +15,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-ErjFfSJDIgZq0qy0Zn5uZ9bZS2AtJq4FuBVuUuQgPTI="; }; + strictDeps = true; nativeBuildInputs = [ pkg-config autoreconfHook sphinx ]; buildInputs = [ openssl c-ares libxml2 sqlite zlib libssh2 ] ++ @@ -28,7 +29,7 @@ stdenv.mkDerivation rec { ]; prePatch = '' - patchShebangs doc/manual-src/en/mkapiref.py + patchShebangs --build doc/manual-src/en/mkapiref.py ''; checkInputs = [ cppunit ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e4a599c7c17..11e5d18fd15 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2042,7 +2042,6 @@ with pkgs; aria2 = callPackage ../tools/networking/aria2 { inherit (darwin.apple_sdk.frameworks) Security; - inherit (python3Packages) sphinx; }; aria = aria2;