Skip to content
This repository was archived by the owner on Feb 4, 2021. It is now read-only.

Include some fixups from my Android 10 tests #13

Open
dasJ wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Include some fixups from my Android 10 tests #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
549541d
Really fail on errors
dasJ Oct 18, 2019
ac91e2f
Switch to nixpkgs 19.09
dasJ Oct 18, 2019
a8144a4
Run unpack hooks
dasJ Oct 18, 2019
a878560
roomservice/oneplus3: Drop defaulted revision
dasJ Oct 19, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 2 additions & 9 deletions buildenv.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,4 @@
{ pkgs }:
let
jdk = pkgs.callPackage <nixpkgs/pkgs/development/compilers/openjdk/8.nix> {
bootjdk = pkgs.callPackage <nixpkgs/pkgs/development/compilers/openjdk/bootstrap.nix> { version = "8"; };
inherit (pkgs.gnome2) GConf gnome_vfs;
minimal = true;
};
in pkgs.buildFHSUserEnv {
{ pkgs }: pkgs.buildFHSUserEnv {
name = "nixdroid-build";
targetPkgs = pkgs: with pkgs; [
bc
Expand All @@ -21,7 +14,7 @@ in pkgs.buildFHSUserEnv {
nettools
androidenv.androidPkgs_9_0.platform-tools
androidenv.androidPkgs_9_0.androidsdk
jdk
jdk8
schedtool
utillinux
m4
Expand Down
5 changes: 4 additions & 1 deletion default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,10 @@ in { ota = stdenv.mkDerivation rec {
name = "nixdroid-${rev}-${device}";
srcs = repo2nix.sources;
unpackPhase = ''
runHook preUnpack
${optionalString usePatchedCoreutils "export PATH=${callPackage ./misc/coreutils.nix {}}/bin/:$PATH"}
echo $PATH
${repo2nix.unpackPhase}
runHook postUnpack
'';

prePatch = ''
Expand Down Expand Up @@ -84,6 +85,8 @@ in { ota = stdenv.mkDerivation rec {
export USER="$(id -un)"
export RELEASE_TYPE="${romtype}" # FIXME: does this work on non-lineage roms?

set -e

source build/envsetup.sh
breakfast "${device}"
mka otatools-package target-files-package dist
Expand Down
2 changes: 1 addition & 1 deletion hydra/hydra.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ let
};
defaultInputs = args: {
inherit nixdroid;
nixpkgs = mkInput "git" "https://github.com/nixos/nixpkgs-channels nixos-19.03" false;
nixpkgs = mkInput "git" "https://github.com/nixos/nixpkgs-channels nixos-19.09" false;
rev = mkInput "string" args.rev false;
keyStorePath = mkInput "string" "/var/lib/nixdroid/keystore" false;
device = mkInput "string" args.device false;
Expand Down
2 changes: 1 addition & 1 deletion roomservice/LineageOS/oneplus3.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@
<project name="LineageOS/android_device_oppo_common" path="device/oppo/common" remote="github" />
<project name="LineageOS/android_kernel_oneplus_msm8996" path="kernel/oneplus/msm8996" remote="github" />
<project name="LineageOS/android_packages_resources_devicesettings" path="packages/resources/devicesettings" remote="github" />
<project name="TheMuppets/proprietary_vendor_oneplus" path="vendor/oneplus" remote="github" revision="lineage-16.0" />
<project name="TheMuppets/proprietary_vendor_oneplus" path="vendor/oneplus" remote="github" />
</manifest>