diff options
| author | Free Potion <42352817+freepotion@users.noreply.github.com> | 2018-12-21 23:02:12 +0300 |
|---|---|---|
| committer | Free Potion <42352817+freepotion@users.noreply.github.com> | 2018-12-21 23:02:12 +0300 |
| commit | 2b0699b2c4a644ac274a2b4aee58c26667224aa6 (patch) | |
| tree | f64f7ca789a37c986c8bd5e21de9b5c43fc7a6e9 /pkgs/games/ivan | |
| parent | 814319f1ae7665590e120db268e2aefe9f82458d (diff) | |
| download | nixpkgs-2b0699b2c4a644ac274a2b4aee58c26667224aa6.tar nixpkgs-2b0699b2c4a644ac274a2b4aee58c26667224aa6.tar.gz nixpkgs-2b0699b2c4a644ac274a2b4aee58c26667224aa6.tar.bz2 nixpkgs-2b0699b2c4a644ac274a2b4aee58c26667224aa6.tar.lz nixpkgs-2b0699b2c4a644ac274a2b4aee58c26667224aa6.tar.xz nixpkgs-2b0699b2c4a644ac274a2b4aee58c26667224aa6.tar.zst nixpkgs-2b0699b2c4a644ac274a2b4aee58c26667224aa6.zip | |
ivan: 054 -> 055
Diffstat (limited to 'pkgs/games/ivan')
| -rw-r--r-- | pkgs/games/ivan/default.nix | 9 | ||||
| -rw-r--r-- | pkgs/games/ivan/new.patch | 33 |
2 files changed, 3 insertions, 39 deletions
diff --git a/pkgs/games/ivan/default.nix b/pkgs/games/ivan/default.nix index 6d31369a159..ad3baa9d22a 100644 --- a/pkgs/games/ivan/default.nix +++ b/pkgs/games/ivan/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "ivan-${version}"; - version = "054"; + version = "055"; src = fetchFromGitHub { owner = "Attnam"; repo = "ivan"; rev = "v${version}"; - sha256 = "0ayhp9qvxsi5dsgjvy43i3lpdis883g1xn2b8l5xkwxcqfnvsfmq"; + sha256 = "10qrwzwfzqs7f663x1cbbhisz60axcl51glxq33zaxl0jwnmma2p"; }; nativeBuildInputs = [ cmake pkgconfig ]; @@ -18,11 +18,8 @@ stdenv.mkDerivation rec { hardeningDisable = ["all"]; - # To store bone and high score files in ~/.ivan of the current user - patches = [./new.patch]; - # Enable wizard mode - cmakeFlags = ["-DCMAKE_CXX_FLAGS=-DWIZARD" "-DFORCE_HOME_AS_STATE_DIR=ON"]; + cmakeFlags = ["-DCMAKE_CXX_FLAGS=-DWIZARD"]; # Help CMake find SDL_mixer.h NIX_CFLAGS_COMPILE = "-I${SDL2_mixer}/include/SDL2"; diff --git a/pkgs/games/ivan/new.patch b/pkgs/games/ivan/new.patch deleted file mode 100644 index d0ed866b3f3..00000000000 --- a/pkgs/games/ivan/new.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 13e143e..a6f9176 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -13,10 +13,14 @@ set(CMAKE_CXX_FLAGS "-std=c++11 ${CMAKE_CXX_FLAGS}") - add_definitions(-DIVAN_VERSION="${PROJECT_VERSION}" -DUSE_SDL) - - option(BUILD_MAC_APP "Build standalone application for MacOS" OFF) -+option(FORCE_HOME_AS_STATE_DIR "Statedir will be /.ivan/ in current user's homedir" OFF) - - if(UNIX) - add_definitions(-DUNIX) - include(GNUInstallDirs) -+ if(FORCE_HOME_AS_STATE_DIR) -+ add_definitions(-DFORCE_HOME_AS_STATE_DIR) -+ endif(FORCE_HOME_AS_STATE_DIR) - - if(BUILD_MAC_APP) - install(DIRECTORY Graphics Script Music Sound DESTINATION "ivan") -diff --git a/Main/Source/game.cpp b/Main/Source/game.cpp -index 323a185..012feb3 100644 ---- a/Main/Source/game.cpp -+++ b/Main/Source/game.cpp -@@ -5191,6 +5191,9 @@ festring game::GetDataDir() - - festring game::GetStateDir() - { -+#ifdef FORCE_HOME_AS_STATE_DIR -+ return GetHomeDir()+"/.ivan/"; -+#endif - #ifdef UNIX - #ifdef MAC_APP - return GetHomeDir(); |