chvp/nixos-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Style fixes

Browse source
This commit is contained in:
Charlotte Van Petegem 2020-03-21 12:24:07 +01:00
parent 61db2c0d23
commit c989806a11
1 changed files with 2 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
shells/accentor-android.nix
View file

@ -35,16 +35,13 @@ let
}; };
gradle-fhs-nix = pkgs.writeText "gradle-fhs.nix" '' gradle-fhs-nix = pkgs.writeText "gradle-fhs.nix" ''
{ run ? "bash" }: { run }:
let let
pkgs = import <nixpkgs> {}; pkgs = import <nixpkgs> {};
in in
(pkgs.buildFHSUserEnv { (pkgs.buildFHSUserEnv {
name = "android-sdk-env"; name = "android-sdk-env";
targetPkgs = pkgs: (with pkgs; targetPkgs = pkgs: (with pkgs; [ glibc ]);
[
glibc
]);
profile = ''' profile = '''
export ANDROID_SDK_ROOT="${composed.androidsdk}/libexec/android-sdk/" 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/"
'';
} }