From 0fb7150a0656c88abf278a3afd8021c1e6d2a04d Mon Sep 17 00:00:00 2001
From: Jules Aguillon
Date: Thu, 24 Mar 2022 18:42:44 +0100
Subject: Revert to the previous CI

The new CI script doesn't work on forks.

This reverts commit f3aa218de40a44eeaf1e7ec169bb2b3d4da526ad.
This reverts commit 3373c59b903cfcccedf31278f9f18ea305e3a567.
---
 shell.nix | 32 ++++++++------------------------
 1 file changed, 8 insertions(+), 24 deletions(-)

(limited to 'shell.nix')

diff --git a/shell.nix b/shell.nix
index 1ee5012..8036a5e 100644
--- a/shell.nix
+++ b/shell.nix
@@ -1,35 +1,19 @@
 { pkgs ? import <nixpkgs> {
-  config.android_sdk.accept_license = true;
-  config.allowUnfree = true;
-} }:
+    config.android_sdk.accept_license = true;
+    config.allowUnfree = true;
+  } }:
 
 let
+  jdk = pkgs.openjdk8;
+
   android = pkgs.androidenv.composeAndroidPackages {
     buildToolsVersions = [ "30.0.3" ];
     platformVersions = [ "30" ];
     abiVersions = [ "armeabi-v7a" ];
   };
 
-  buildInputs =
-    [ pkgs.findutils pkgs.openjdk8 android.androidsdk pkgs.fontforge ];
-
-  # Env variable required by the Makefile
+in
+pkgs.mkShell {
+  buildInputs = [ pkgs.findutils jdk android.androidsdk pkgs.fontforge ];
   ANDROID_HOME = "${android.androidsdk}/libexec/android-sdk";
-
-  # Build the debug APK. Exposed as an attribute, used in CI
-  debug-apk = pkgs.stdenv.mkDerivation {
-    name = "unexpected-keyboard-debug";
-    src = ./.;
-    inherit buildInputs ANDROID_HOME;
-    buildPhase = ''
-      make
-    '';
-    installPhase = ''
-      mkdir -p $out
-      mv _build/*.apk $out
-    '';
-  };
-
-in pkgs.mkShell { inherit buildInputs ANDROID_HOME; } // {
-  inherit debug-apk;
 }
-- 
cgit v1.2.3