cataclysm-dda: 0.C -> 0.D

pkgs/games/cataclysm-dda/default.nix

@@ -1,47 +1,37 @@
-{ stdenv, callPackage, ncurses
+{ stdenv, callPackage, CoreFoundation
-, tiles ? true, Cocoa, libicns
+, tiles ? true, Cocoa
 , debug ? false
 }:
 
 let
   inherit (stdenv.lib) optionals optionalString;
   inherit (callPackage ./common.nix { inherit tiles Cocoa debug; }) common utils;
-  inherit (utils) fetchFromCleverRaven installMacOSAppLauncher;
+  inherit (utils) fetchFromCleverRaven installXDGAppLauncher installMacOSAppLauncher;
 in
 
 stdenv.mkDerivation (common // rec {
-  version = "0.C";
+  version = "0.D";
   name = "cataclysm-dda-${version}";
 
   src = fetchFromCleverRaven {
     rev = "${version}";
-    sha256 = "03sdzsk4qdq99qckq0axbsvg1apn6xizscd8pwp5w6kq2fyj5xkv";
+    sha256 = "00zzhx1mh1qjq668cga5nbrxp2qk6b82j5ak65skhgnlr6ii4ysc";
   };
 
-  nativeBuildInputs = common.nativeBuildInputs
+  buildInputs = common.buildInputs
-    ++ optionals (tiles && stdenv.isDarwin) [ libicns ];
+    ++ optionals stdenv.isDarwin [ CoreFoundation ];
 
   patches = [ ./patches/fix_locale_dir.patch ];
 
-  makeFlags = common.makeFlags
+  postPatch = common.postPatch + ''
-    ++ optionals stdenv.isDarwin [
+    substituteInPlace lua/autoexec.lua --replace "/usr/share" "$out/share"
-    "OSX_MIN=10.6"  # SDL for macOS only supports deploying on 10.6 and above
-  ] ++ optionals stdenv.cc.isGNU [
-    "WARNINGS+=-Wno-deprecated-declarations"
-    "WARNINGS+=-Wno-ignored-attributes"
-  ] ++ optionals stdenv.cc.isClang [
-    "WARNINGS+=-Wno-inconsistent-missing-override"
-  ];
-
-  NIX_CFLAGS_COMPILE = optionalString stdenv.cc.isClang "-Wno-user-defined-warnings";
-
-  postBuild = optionalString (tiles && stdenv.isDarwin) ''
-    # iconutil on macOS is not available in nixpkgs
-    png2icns data/osx/AppIcon.icns data/osx/AppIcon.iconset/*
   '';
 
-  postInstall = optionalString (tiles && stdenv.isDarwin)
+  postInstall = optionalString tiles
-    installMacOSAppLauncher;
+  ( if !stdenv.isDarwin
+    then installXDGAppLauncher
+    else installMacOSAppLauncher
+  );
 
   # Disable, possible problems with hydra
   #enableParallelBuilding = true;

pkgs/games/cataclysm-dda/patches/fix_locale_dir.patch

@@ -1,20 +1,20 @@
 diff --git a/src/translations.cpp b/src/translations.cpp
-index 6520cfe..49f7b2c 100644
+index 2585b7ec56..7bb005823c 100644
 --- a/src/translations.cpp
 +++ b/src/translations.cpp
-@@ -72,15 +72,11 @@ void set_language(bool reload_options)
+@@ -195,14 +195,12 @@ void set_language()
- 
+     auto env = getenv( "LANGUAGE" );
-     // Step 2. Bind to gettext domain.
+     locale_dir = std::string( FILENAMES["base_path"] + "lang/mo/" + ( env ? env : "none" ) +
-     const char *locale_dir;
+                               "/LC_MESSAGES/cataclysm-dda.mo" );
--#ifdef __linux__
+-#elif (defined __linux__ || (defined MACOSX && !defined TILES))
-     if (!FILENAMES["base_path"].empty()) {
++#else
-         locale_dir = std::string(FILENAMES["base_path"] + "share/locale").c_str();
+     if( !FILENAMES["base_path"].empty() ) {
+         locale_dir = FILENAMES["base_path"] + "share/locale";
      } else {
          locale_dir = "lang/mo";
      }
 -#else
 -    locale_dir = "lang/mo";
--#endif // __linux__
+ #endif
  
-     bindtextdomain("cataclysm-dda", locale_dir);
+     const char *locale_dir_char = locale_dir.c_str();
-     bind_textdomain_codeset("cataclysm-dda", "UTF-8");

pkgs/top-level/all-packages.nix

@@ -21008,8 +21008,7 @@ in
   };
 
   cataclysm-dda = callPackage ../games/cataclysm-dda {
-    inherit (darwin.apple_sdk.frameworks) Cocoa;
+    inherit (darwin.apple_sdk.frameworks) CoreFoundation Cocoa;
-    ncurses = ncurses5;
   };
 
   cataclysm-dda-git = callPackage ../games/cataclysm-dda/git.nix {