nix: fix crypto

[xonotic/xonotic.git] / derivation.nix

diff --git a/derivation.nix b/derivation.nix
index a12eee9d90300320490ad980608c349c15e01d3b..f38ab3db001d02871a67cf11e4f2bcb54154926b 100644 (file)
--- 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)
             '';
         };
 
@@ -229,14 +232,12 @@ let
                     chmod +w bin/*
                     cd bin
 
-                    for exe in darkplaces-sdl; do
-                        rpath=$(patchelf --print-rpath $exe)
-                        rpath=''${rpath:+$rpath:}${lib.makeLibraryPath runtimeInputs}
-                        patchelf --set-rpath $rpath $exe
-                    done
-
                     for exe in dedicated sdl; do
-                        cp darkplaces-$exe $out/bin/xonotic-linux64-$exe
+                        f=darkplaces-$exe
+                        rpath=$(patchelf --print-rpath $f)
+                        rpath=''${rpath:+$rpath:}${lib.makeLibraryPath runtimeInputs}
+                        patchelf --set-rpath $rpath $f
+                        cp $f $out/bin/xonotic-linux64-$exe
                     done
                 '';
             };
@@ -345,6 +346,24 @@ let
                 mkdir $out
                 cp -r $src/. $out
             '';
+
+            passthru.dance = mkDerivation rec {
+                name = "dance";
+                version = "xonotic-${VERSION}";
+
+                src = pkgs.fetchurl {
+                    url = http://beta.xonotic.org/autobuild-bsp/dance-full-88c416b8c11bdcecfdb889af2a2b97b4c0e2b8de-319ee7234504199da56f07ce25185f6d6cb889cd.pk3;
+                    sha256 = "1jgdg4mz56kbxcy3mwn4h5qlf3ahm1cmarp9l70fz9nfn6cnaknq";
+                };
+
+                phases = [ "installPhase" ];
+
+                installPhase = ''
+                    mkdir -p $out
+                    cd $out
+                    ${pkgs.unzip}/bin/unzip $src
+                '';
+            };
         };
 
         xonotic-music = mkDerivation rec {
@@ -375,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;
@@ -397,6 +430,9 @@ let
                     xonotic-music
                     xonotic-nexcompat
                 ;
+                inherit (xonotic-maps)
+                    dance
+                ;
             };
 
             phases = [ "installPhase" ];
@@ -428,8 +464,12 @@ 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
+
+                        exec ${darkplaces}/bin/xonotic-linux64-dedicated "\''${@}"
                         EOF
                         chmod +x $out/init
                     '';