diff options
Diffstat (limited to 'nixpkgs/pkgs/games/cataclysm-dda/git.nix')
-rw-r--r-- | nixpkgs/pkgs/games/cataclysm-dda/git.nix | 30 |
1 files changed, 8 insertions, 22 deletions
diff --git a/nixpkgs/pkgs/games/cataclysm-dda/git.nix b/nixpkgs/pkgs/games/cataclysm-dda/git.nix index c8f031d31942..b872e95d5896 100644 --- a/nixpkgs/pkgs/games/cataclysm-dda/git.nix +++ b/nixpkgs/pkgs/games/cataclysm-dda/git.nix @@ -1,43 +1,29 @@ -{ stdenv, callPackage -, tiles ? true, Cocoa, CoreFoundation +{ stdenv, callPackage, CoreFoundation +, tiles ? true, Cocoa , debug ? false }: let - inherit (stdenv.lib) optionals optionalString substring; - inherit (callPackage ./common.nix { inherit tiles Cocoa debug; }) common utils; - inherit (utils) fetchFromCleverRaven installXDGAppLauncher installMacOSAppLauncher; + inherit (stdenv.lib) substring; + inherit (callPackage ./common.nix { inherit tiles CoreFoundation Cocoa debug; }) common utils; + inherit (utils) fetchFromCleverRaven; in stdenv.mkDerivation (common // rec { - version = "2018-07-15"; + version = "2019-05-03"; name = "cataclysm-dda-git-${version}"; src = fetchFromCleverRaven { - rev = "e1e5d81"; - sha256 = "198wfj8l1p8xlwicj92cq237pzv2ha9pcf240y7ijhjpmlc9jkr1"; + rev = "65a05026e7306b5d1228dc6ed885c43447f128b5"; + sha256 = "18yn0h6b4j9lx67sq1d886la3l6l7bqsnwj6mw2khidssiy18y0n"; }; - buildInputs = common.buildInputs - ++ optionals stdenv.isDarwin [ CoreFoundation ]; - patches = [ ./patches/fix_locale_dir_git.patch ]; makeFlags = common.makeFlags ++ [ "VERSION=git-${version}-${substring 0 8 src.rev}" ]; - postInstall = optionalString tiles - ( if !stdenv.isDarwin - then installXDGAppLauncher - else installMacOSAppLauncher - ); - - # https://hydra.nixos.org/build/65193254 - # src/weather_data.cpp:203:1: fatal error: opening dependency file obj/tiles/weather_data.d: No such file or directory - # make: *** [Makefile:687: obj/tiles/weather_data.o] Error 1 - enableParallelBuilding = false; - meta = with stdenv.lib.maintainers; common.meta // { maintainers = common.meta.maintainers ++ [ rardiol ]; }; |