From 911ed56185391d1c6079c00378ed55452b800437 Mon Sep 17 00:00:00 2001
From: Jean-Paul Calderone <exarkun@twistedmatrix.com>
Date: Wed, 9 Nov 2022 16:23:26 -0500
Subject: [PATCH] add unzip, necessary for an earlier step that I had cached
for a while
`buildozer -v android debug` dumps a ton of stuff into `.buildozer` so the
builds are hardly reproducible, even with all this effort ...
---
flake.lock | 6 +++---
flake.nix | 10 +++++++++-
2 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/flake.lock b/flake.lock
index 5e09020..483e1d4 100644
--- a/flake.lock
+++ b/flake.lock
@@ -93,11 +93,11 @@
"pythonForAndroidSrc": {
"flake": false,
"locked": {
- "lastModified": 1668026528,
- "narHash": "sha256-xGUHSKOK4K+LoZDpwG1xA0rsAZlQWCdw2hS29qilUzY=",
+ "lastModified": 1668028046,
+ "narHash": "sha256-5N5OUBJmoYR+MHsKO60h+cvh+kvXY2yvai4loXsW02c=",
"owner": "PrivateStorageio",
"repo": "python-for-android",
- "rev": "05c60d84c0f5fa3e8658510ce970de28efaf9483",
+ "rev": "92a9d3b22e80a3c9c4f41fa3944ebd80aa662991",
"type": "github"
},
"original": {
diff --git a/flake.nix b/flake.nix
index 581d566..a43d690 100644
--- a/flake.nix
+++ b/flake.nix
@@ -92,7 +92,15 @@
# https://github.com/kivy/python-for-android/blob/v2020.04.29/doc/source/troubleshooting.rst#errors-related-to-java-version
openjdk8
ant
- ] ++ (getBuildInputs (drv: drv.buildInputs) [ openssl libffi python39 ]);
+
+ # python-for-android recipes all want to download and unpack their
+ # own sources! aaaaaa
+ unzip
+ ] ++
+
+ # Also we need build dependencies for all of the things it is going to
+ # build!
+ (getBuildInputs (drv: drv.buildInputs) [ openssl libffi python39 ]);
nativeBuildInputs =
with pkgs; getBuildInputs (drv: drv.nativeBuildInputs) [ openssl libffi python39 ];
--
GitLab