uncommitted changes

diff --git a/default.nix b/default.nix
index b6a308f..27024ca 100644
--- a/default.nix
+++ b/default.nix
@@ -15,8 +15,6 @@
 , Daemon-commit
 , Unvanquished
 , Unvanquished-commit
-, unvanquished_src-dpkdir
-, unvanquished_src-dpkdir-commit
 }:

 with pkgs;
@@ -45,13 +43,6 @@ in rec {
       ref = Unvanquished;
       submodules = true;
     };
-
-    # assets
-    unvanquished_dpk = builtins.fetchGit {
-      url = "https://github.com/UnvanquishedAssets/unvanquished_src.dpkdir.git";
-      rev = unvanquished_src-dpkdir-commit;
-      ref = unvanquished_src-dpkdir;
-    };
   };

   nacl-hacks-8 = pkgs.callPackage ./nacl-hacks.nix {
@@ -76,7 +67,7 @@ in rec {
   };

   unvanquished-dpk = pkgs.callPackage ./unv-dpk.nix {
-    source = srcs.unvanquished_dpk;
+    source = srcs.unvanquished;
     inherit unvanquished-vms;
     inherit filename;
   };
diff --git a/nobuild b/nobuild
index 17a6ab1..772275b 100644
--- a/nobuild
+++ b/nobuild
@@ -1 +1 @@
-^master$\|^0.54.0/sync$\|^gamelogic-entityState/experimental$\|^juggernaut/deploy$
+^master$\|^0.54.0/sync$\|^gamelogic-entityState/experimental$\|^juggernaut/deploy$\|^dpkdir/juggernaut/deploy$
diff --git a/server-wrapper.nix b/server-wrapper.nix
index e0efaae..33aa854 100644
--- a/server-wrapper.nix
+++ b/server-wrapper.nix
@@ -58,6 +58,7 @@ in writeScript "unvanquished-server" ''
               --die-with-parent \
               --setenv PATH  "${bash}/bin" \
               --setenv SHELL "${bash}/bin/bash" \
+              --setenv TMPDIR "/tmp" \
               -- \
                   ${gdb}/bin/gdb -x $HOME/unv-testing-server/gdbinit.txt --args \
                       "${daemon}/bin/daemonded" \
diff --git a/unv-dpk.nix b/unv-dpk.nix
index 86ff428..f03f39b 100644
--- a/unv-dpk.nix
+++ b/unv-dpk.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   ];

   unpackPhase = ''
-    cp -v -r --no-preserve=mode ${source} unvanquished_src.dpkdir
+    cp -v -r --no-preserve=mode ${source}/pkg/unvanquished_src.dpkdir unvanquished_src.dpkdir
   '';

   buildPhase = ''
diff --git a/update.sh b/update.sh
index e1d099e..3851b26 100755
--- a/update.sh
+++ b/update.sh
@@ -16,7 +16,7 @@ deploy_base_branch="master"
 testing_base_branch="master"
 experimental_base_branch="master"

-repos="DaemonEngine/Daemon Unvanquished/Unvanquished UnvanquishedAssets/unvanquished_src.dpkdir"
+repos="DaemonEngine/Daemon Unvanquished/Unvanquished"

 # the nightly pakpath
 pakpath="$HOME/unvanquished-server/pakpath"