Merge branch 'DefaultUser/zsh_autocomplete' into 'master'

[xonotic/xonotic.git] / default.nix

diff --git a/default.nix b/default.nix
index 6948512715643d3ac598cd88230bd914bf1ab2cd..4ee0c65ae485af1edf9d9cb4b3429f231ea6d5d2 100644 (file)
--- a/default.nix
+++ b/default.nix
@@ -8,6 +8,7 @@
 with pkgs;
 let
     VERSION = "0.8.2";
+    cmake = pkgs.cmake_2_8;
     targets = rec {
         xonotic = mkDerivation { pki = true; dp = true; data = true; } rec {
             name = "xonotic-${version}";
@@ -22,7 +23,7 @@ let
             ];
 
             env = {
-                QCC = "${gmqcc}/gmqcc";
+                QCC = "${gmqcc}/bin/gmqcc";
             };
 
             nativeBuildInputs = [
@@ -77,8 +78,8 @@ let
             src = ./gmqcc;
 
             installPhase = ''
-                mkdir $out
-                cp -r . $out
+                mkdir -p $out/bin
+                cp gmqcc $out/bin
             '';
         };