From 2ae34aa9a504870bbec43502631060f036229a72 Mon Sep 17 00:00:00 2001
From: Daniel Weipert <code@drogueronin.de>
Date: Mon, 29 May 2023 10:23:44 +0200
Subject: gitlab-ci

---
 .gitlab-ci.yml | 3 +--
 shell.nix      | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 79f903a..1e08206 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,8 +7,7 @@ build:
 
   script:
     - export NIX_PATH=nixpkgs=channel:nixos-unstable
-    - nix-shell
-    - make build
+    - nix-shell && make build
 
   artifacts:
     paths:
diff --git a/shell.nix b/shell.nix
index 53e947c..b43bd1e 100644
--- a/shell.nix
+++ b/shell.nix
@@ -7,7 +7,6 @@ mkShell rec {
   name = "android-shell";
 
 	buildInputs = [
-    sudo
     gnumake
     jdk
     android-composition.androidsdk
@@ -21,6 +20,6 @@ mkShell rec {
 
   shellHook = ''
     # TODO: replace with nix builtins
-    sudo python ./nix/android-shell-shellHook.py ${ANDROID_HOME}/build-tools ${ANDROID_HOME}/platforms
+    python ./nix/android-shell-shellHook.py ${ANDROID_HOME}/build-tools ${ANDROID_HOME}/platforms
   '';
 }
-- 
cgit v1.2.3