git.iko.soy/typeable/nixpkgs
on master help sign in
ivan: 054 -> 055
commit2b0699b2c4a644ac274a2b4aee58c26667224aa6 authorFree Potion <42352817+freepotion@users.noreply.github.com> dateFri 21 Dec 2018, 23:02 (8 years ago) parent814319f
2 files changed+3−39
pkgs/games/ivan/default.nix+3−6 pkgs/games/ivan/new.patch−33
pkgs/games/ivan/default.nix+3−6
@@ -3,13 +3,13 @@
33stdenv.mkDerivation rec {
44
55 name = "ivan-${version}";
6− version = "054";
6+ version = "055";
77
88 src = fetchFromGitHub {
99 owner = "Attnam";
1010 repo = "ivan";
1111 rev = "v${version}";
12− sha256 = "0ayhp9qvxsi5dsgjvy43i3lpdis883g1xn2b8l5xkwxcqfnvsfmq";
12+ sha256 = "10qrwzwfzqs7f663x1cbbhisz60axcl51glxq33zaxl0jwnmma2p";
1313 };
1414
1515 nativeBuildInputs = [ cmake pkgconfig ];
@@ -18,11 +18,8 @@ stdenv.mkDerivation rec {
1818
1919 hardeningDisable = ["all"];
2020
21− # To store bone and high score files in ~/.ivan of the current user
22− patches = [./new.patch];
23−
2421 # Enable wizard mode
25− cmakeFlags = ["-DCMAKE_CXX_FLAGS=-DWIZARD" "-DFORCE_HOME_AS_STATE_DIR=ON"];
22+ cmakeFlags = ["-DCMAKE_CXX_FLAGS=-DWIZARD"];
2623
2724 # Help CMake find SDL_mixer.h
2825 NIX_CFLAGS_COMPILE = "-I${SDL2_mixer}/include/SDL2";
pkgs/games/ivan/new.patchdeleted−33
@@ -1,33 +0,0 @@
1−diff --git a/CMakeLists.txt b/CMakeLists.txt
2−index 13e143e..a6f9176 100644
3−--- a/CMakeLists.txt
4−+++ b/CMakeLists.txt
5−@@ -13,10 +13,14 @@ set(CMAKE_CXX_FLAGS "-std=c++11 ${CMAKE_CXX_FLAGS}")
6− add_definitions(-DIVAN_VERSION="${PROJECT_VERSION}" -DUSE_SDL)
7−
8− option(BUILD_MAC_APP "Build standalone application for MacOS" OFF)
9−+option(FORCE_HOME_AS_STATE_DIR "Statedir will be /.ivan/ in current user's homedir" OFF)
10−
11− if(UNIX)
12− add_definitions(-DUNIX)
13− include(GNUInstallDirs)
14−+ if(FORCE_HOME_AS_STATE_DIR)
15−+ add_definitions(-DFORCE_HOME_AS_STATE_DIR)
16−+ endif(FORCE_HOME_AS_STATE_DIR)
17−
18− if(BUILD_MAC_APP)
19− install(DIRECTORY Graphics Script Music Sound DESTINATION "ivan")
20−diff --git a/Main/Source/game.cpp b/Main/Source/game.cpp
21−index 323a185..012feb3 100644
22−--- a/Main/Source/game.cpp
23−+++ b/Main/Source/game.cpp
24−@@ -5191,6 +5191,9 @@ festring game::GetDataDir()
25−
26− festring game::GetStateDir()
27− {
28−+#ifdef FORCE_HOME_AS_STATE_DIR
29−+ return GetHomeDir()+"/.ivan/";
30−+#endif
31− #ifdef UNIX
32− #ifdef MAC_APP
33− return GetHomeDir();