From: Martin Taibr Date: Fri, 10 Jan 2020 16:45:23 +0000 (+0100) Subject: rename daemon to daemon-glue X-Git-Tag: xonotic-v0.8.5~100 X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=4de6a918422eb1ca50526cca73c0a7da91917ddd rename daemon to daemon-glue --- diff --git a/.gitignore b/.gitignore index ab43afbb..83ee9411 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ /build/ -/daemon +/daemon-glue /darkplaces /gmqcc /div0-gittools diff --git a/CMakeLists.txt b/CMakeLists.txt index 23080598..fa840e5e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,7 +14,7 @@ function(subproject id name) endfunction() subproject(PKI d0_blind_id) -subproject(DAEMON daemon) +subproject(DAEMON daemon-glue) subproject(DP darkplaces) subproject(QCC gmqcc) subproject(RADIANT netradiant) diff --git a/derivation.nix b/derivation.nix index d0365715..35051b97 100644 --- a/derivation.nix +++ b/derivation.nix @@ -77,7 +77,7 @@ let result = (cleanSourceFilter name type) && !(name == "${project}/release") && !(name == "${project}/d0_blind_id") - && !(name == "${project}/daemon") + && !(name == "${project}/daemon-glue") && !(name == "${project}/darkplaces") && !(name == "${project}/data") && !(name == "${project}/gmqcc")