From: TimePath Date: Sun, 16 Jul 2017 09:59:09 +0000 (+1000) Subject: Add netradiant nix env X-Git-Tag: xonotic-v0.8.5~200 X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=69a3685247416ab506b7b4934c2193237d63cd8e Add netradiant nix env --- diff --git a/default.nix b/default.nix index d4d10211..2c672553 100644 --- a/default.nix +++ b/default.nix @@ -8,6 +8,8 @@ let VERSION = "0.8.2"; targets = rec { xonotic = stdenv.mkDerivation rec { + name = "xonotic-${version}"; + version = VERSION; XON_NO_DAEMON = true; XON_NO_RADIANT = true; @@ -15,10 +17,6 @@ let XON_NO_QCC = true; QCC = "${gmqcc}/gmqcc"; - version = VERSION; - - name = "xonotic-${version}"; - src = lib.sourceFilesBySuffices ./. [ ".txt" ".cmake" ".in" ".c" ".cpp" ".h" @@ -79,9 +77,8 @@ let }; gmqcc = stdenv.mkDerivation rec { - version = "xonotic-${VERSION}"; - name = "gmqcc-${version}"; + version = "xonotic-${VERSION}"; src = ./gmqcc; @@ -92,5 +89,48 @@ let cp -r . $out ''; }; + + netradiant = stdenv.mkDerivation rec { + name = "netradiant-${version}"; + version = VERSION; + + XON_NO_DAEMON = true; + XON_NO_DP = true; + XON_NO_PKI = true; + XON_NO_QCC = true; + XON_NO_DATA = true; + + src = ./netradiant; + + enableParallelBuilding = true; + + cmakeFlags = [ + "-DDOWNLOAD_MAPS=0" + ]; + + nativeBuildInputs = [ + cmake # for building + git # for versioning + ]; + + buildInputs = [ + pkgconfig + glib + libxml2 + ncurses + libjpeg + libpng + + mesa + + xorg.libXt + xorg.libXmu + xorg.libSM + xorg.libICE + + gnome2.gtk + gnome2.gtkglext + ]; + }; }; in targets