From: TimePath <andrew.hardaker1995@gmail.com>
Date: Sat, 5 May 2018 09:11:12 +0000 (+1000)
Subject: nix: fix crypto
X-Git-Tag: xonotic-v0.8.5~164
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=fedcb5e07e0f110de37ca436183b58f81e2dc493

nix: fix crypto
---

diff --git a/derivation.nix b/derivation.nix
index 8ef886b9..f38ab3db 100644
--- a/derivation.nix
+++ b/derivation.nix
@@ -170,10 +170,13 @@ let
 
             installPhase = ''
                 mkdir -p $out/lib
+                mkdir -p $out/include/d0_blind_id
+
                 cp libd0_blind_id.so $out/lib
+                (cd $src; cp d0.h d0_blind_id.h $out/include/d0_blind_id)
 
-                mkdir -p $out/include/d0_blind_id
-                (cd $src; cp d0_blind_id.h d0.h $out/include/d0_blind_id)
+                cp libd0_rijndael.so $out/lib
+                (cd $src; cp d0_rijndael.h $out/include/d0_blind_id)
             '';
         };
 
@@ -391,6 +394,20 @@ let
             '';
         };
 
+        xonotic-keys = mkDerivation rec {
+            name = "xonotic-keys-${version}";
+            version = VERSION;
+
+            src = srcs."xonotic";
+
+            phases = [ "installPhase" ];
+
+            installPhase = ''
+                mkdir $out
+                cp $src/*.d0pk $out
+            '';
+        };
+
         xonotic = mkDerivation rec {
             name = "xonotic-${version}";
             version = VERSION;
@@ -447,7 +464,11 @@ let
                         mkdir -p $out
                         cat > $out/init <<EOF
                         #!${stdenv.shell}
+                        ${pkgs.coreutils}/bin/ln -s ${xonotic-keys}/* /
+
+                        ${pkgs.coreutils}/bin/ls -l /
                         ${pkgs.coreutils}/bin/ls -l /data
+
                         exec ${darkplaces}/bin/xonotic-linux64-dedicated "\''${@}"
                         EOF
                         chmod +x $out/init