From ecf7b57e1221e72522d4c5bb1e39f63449b72582 Mon Sep 17 00:00:00 2001 From: Mitsuhiro Nakamura Date: Thu, 9 Apr 2020 17:16:25 +0900 Subject: [PATCH] cataclysm-dda{,-git}: support build with USE_XDG_DIR flag --- pkgs/games/cataclysm-dda/common.nix | 4 +++- pkgs/games/cataclysm-dda/git.nix | 3 ++- pkgs/games/cataclysm-dda/stable.nix | 3 ++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/games/cataclysm-dda/common.nix b/pkgs/games/cataclysm-dda/common.nix index 6948db097ae2..9ec73cdebe03 100644 --- a/pkgs/games/cataclysm-dda/common.nix +++ b/pkgs/games/cataclysm-dda/common.nix @@ -1,6 +1,7 @@ { stdenv, runtimeShell, pkgconfig, gettext, ncurses, CoreFoundation , tiles, SDL2, SDL2_image, SDL2_mixer, SDL2_ttf, freetype, Cocoa , debug +, useXdgDir }: let @@ -50,7 +51,8 @@ stdenv.mkDerivation { ''; makeFlags = [ - "PREFIX=$(out)" "USE_HOME_DIR=1" "LANGUAGES=all" + "PREFIX=$(out)" "LANGUAGES=all" + (if useXdgDir then "USE_XDG_DIR=1" else "USE_HOME_DIR=1") ] ++ optionals (!debug) [ "RELEASE=1" ] ++ optionals tiles [ diff --git a/pkgs/games/cataclysm-dda/git.nix b/pkgs/games/cataclysm-dda/git.nix index 7b9228350049..1113fe116dcc 100644 --- a/pkgs/games/cataclysm-dda/git.nix +++ b/pkgs/games/cataclysm-dda/git.nix @@ -1,11 +1,12 @@ { lib, callPackage, CoreFoundation, fetchFromGitHub, pkgs, wrapCDDA , tiles ? true, Cocoa , debug ? false +, useXdgDir ? false }: let common = callPackage ./common.nix { - inherit CoreFoundation tiles Cocoa debug; + inherit CoreFoundation tiles Cocoa debug useXdgDir; }; self = common.overrideAttrs (common: rec { diff --git a/pkgs/games/cataclysm-dda/stable.nix b/pkgs/games/cataclysm-dda/stable.nix index 4176083b861c..076a33a9e899 100644 --- a/pkgs/games/cataclysm-dda/stable.nix +++ b/pkgs/games/cataclysm-dda/stable.nix @@ -1,11 +1,12 @@ { lib, callPackage, CoreFoundation, fetchFromGitHub, pkgs, wrapCDDA , tiles ? true, Cocoa , debug ? false +, useXdgDir ? false }: let common = callPackage ./common.nix { - inherit CoreFoundation tiles Cocoa debug; + inherit CoreFoundation tiles Cocoa debug useXdgDir; }; self = common.overrideAttrs (common: rec {