From c989806a1109b47ca82355c0718743ccc913d49e Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Sat, 21 Mar 2020 12:24:07 +0100 Subject: [PATCH] Style fixes --- shells/accentor-android.nix | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/shells/accentor-android.nix b/shells/accentor-android.nix index ecd8dac6..38e7f91b 100644 --- a/shells/accentor-android.nix +++ b/shells/accentor-android.nix @@ -35,16 +35,13 @@ let }; gradle-fhs-nix = pkgs.writeText "gradle-fhs.nix" '' - { run ? "bash" }: + { run }: let pkgs = import {}; in (pkgs.buildFHSUserEnv { name = "android-sdk-env"; - targetPkgs = pkgs: (with pkgs; - [ - glibc - ]); + targetPkgs = pkgs: (with pkgs; [ glibc ]); profile = ''' export ANDROID_SDK_ROOT="${composed.androidsdk}/libexec/android-sdk/" '''; @@ -105,7 +102,4 @@ pkgs.mkShell { } ) ]; - shellHook = '' - export ANDROID_SDK_ROOT="${composed.androidsdk}/libexec/android-sdk/" - ''; }