From 0c626b147d9ca6e03c8f42686f986fe744e7f899 Mon Sep 17 00:00:00 2001 From: linsui Date: Sun, 23 Jul 2023 20:46:01 +0800 Subject: [PATCH] diffoscope: no more unfree dep --- pkgs/tools/misc/diffoscope/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index d4e8c538b8e7..8ccce5375d55 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -18,7 +18,6 @@ , dtc , e2fsprogs , enableBloat ? true -, enableUnfree ? false , enjarify , fetchurl , file @@ -174,6 +173,7 @@ python3.pkgs.buildPythonApplication rec { abootimg apksigcopier apksigner + apktool cbfstool colord enjarify @@ -214,8 +214,6 @@ python3.pkgs.buildPythonApplication rec { ++ lib.optionals stdenv.isLinux [ oggvideotools ] # This doesn't work on aarch64-darwin ++ lib.optionals (stdenv.hostPlatform != "aarch64-darwin") [ gnumeric ] - # apktool depend on build-tools which requires Android SDK acceptance, therefore, the whole thing is unfree - ++ lib.optionals enableUnfree [ apktool ] )); nativeCheckInputs = with python3.pkgs; [