diff --git a/buildenv.nix b/buildenv.nix
index a2adce2..27c3501 100644
--- a/buildenv.nix
+++ b/buildenv.nix
@@ -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
@@ -21,7 +14,7 @@ in pkgs.buildFHSUserEnv {
       nettools
       androidenv.androidPkgs_9_0.platform-tools
       androidenv.androidPkgs_9_0.androidsdk
-      jdk
+      jdk8
       schedtool
       utillinux
       m4
diff --git a/default.nix b/default.nix
index 3da20ab..91beeaa 100644
--- a/default.nix
+++ b/default.nix
@@ -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 = ''
@@ -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
diff --git a/hydra/hydra.nix b/hydra/hydra.nix
index 46df42d..8cae083 100644
--- a/hydra/hydra.nix
+++ b/hydra/hydra.nix
@@ -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;
diff --git a/roomservice/LineageOS/oneplus3.xml b/roomservice/LineageOS/oneplus3.xml
index 0c8a513..6d08309 100644
--- a/roomservice/LineageOS/oneplus3.xml
+++ b/roomservice/LineageOS/oneplus3.xml
@@ -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>