diff options
| author | Nick Hu <me@nickhu.co.uk> | 2017-06-26 10:15:44 +0100 |
|---|---|---|
| committer | Nick Hu <me@nickhu.co.uk> | 2017-06-26 10:18:55 +0100 |
| commit | 24156c64b4286c981dd387844d0b3b8da976a25e (patch) | |
| tree | 187d1601520612d43b046d76bd55187d74cfc2bf /pkgs/games/dwarf-fortress | |
| parent | ff04c361cf2b4f112706c53ffdd8faab1b4adbf8 (diff) | |
| download | nixlib-24156c64b4286c981dd387844d0b3b8da976a25e.tar nixlib-24156c64b4286c981dd387844d0b3b8da976a25e.tar.gz nixlib-24156c64b4286c981dd387844d0b3b8da976a25e.tar.bz2 nixlib-24156c64b4286c981dd387844d0b3b8da976a25e.tar.lz nixlib-24156c64b4286c981dd387844d0b3b8da976a25e.tar.xz nixlib-24156c64b4286c981dd387844d0b3b8da976a25e.tar.zst nixlib-24156c64b4286c981dd387844d0b3b8da976a25e.zip | |
dfhack: 0.43.05-alpha4 -> 0.43.05-r1
Diffstat (limited to 'pkgs/games/dwarf-fortress')
| -rw-r--r-- | pkgs/games/dwarf-fortress/dfhack/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/games/dwarf-fortress/dfhack/skip-ruby.patch | 24 |
2 files changed, 12 insertions, 18 deletions
diff --git a/pkgs/games/dwarf-fortress/dfhack/default.nix b/pkgs/games/dwarf-fortress/dfhack/default.nix index ce935512178e..ba9cd1e58055 100644 --- a/pkgs/games/dwarf-fortress/dfhack/default.nix +++ b/pkgs/games/dwarf-fortress/dfhack/default.nix @@ -7,12 +7,12 @@ let dfVersion = "0.43.05"; # version = "${dfVersion}-r1"; # rev = "refs/tags/${version}"; - version = "${dfVersion}-alpha4"; + version = "${dfVersion}-r1"; rev = "refs/tags/${version}"; - sha256 = "0wnwdapw955k69ds5xh5qsh7h0l547wjxgcy8hkvly6wp5c16sls"; + sha256 = "1hw0miimzx52p36jm9bimsm5j68rb7dd9kw0yivcwbwixbajsi1w"; # revision of library/xml submodule - xmlRev = "bb4228f58b1601c4868c95be6763f5ff2e5d0a08"; + xmlRev = "a8e80088b9cc934da993dc244ece2d0ae14143da"; arch = if stdenv.system == "x86_64-linux" then "64" diff --git a/pkgs/games/dwarf-fortress/dfhack/skip-ruby.patch b/pkgs/games/dwarf-fortress/dfhack/skip-ruby.patch index 619060dc2534..877f6c3d215a 100644 --- a/pkgs/games/dwarf-fortress/dfhack/skip-ruby.patch +++ b/pkgs/games/dwarf-fortress/dfhack/skip-ruby.patch @@ -1,16 +1,10 @@ -diff -ru3 dfhack-ae59b4f/plugins/ruby/CMakeLists.txt dfhack-ae59b4f-new/plugins/ruby/CMakeLists.txt ---- dfhack-ae59b4f/plugins/ruby/CMakeLists.txt 1970-01-01 03:00:01.000000000 +0300 -+++ dfhack-ae59b4f-new/plugins/ruby/CMakeLists.txt 2016-11-23 15:29:09.907286546 +0300 -@@ -1,3 +1,4 @@ -+IF(FALSE) - IF (APPLE) - SET(RUBYLIB ${CMAKE_CURRENT_SOURCE_DIR}/osx${DFHACK_BUILD_ARCH}/libruby.dylib) - SET(RUBYLIB_INSTALL_NAME "libruby.dylib") -@@ -48,6 +49,7 @@ - "482c1c418f4ee1a5f04203eee1cda0ef") - ENDIF() - ENDIF() -+ENDIF() +diff --git a/plugins/ruby/CMakeLists.txt b/plugins/ruby/CMakeLists.txt +index f1ef12ac..0976e18a 100644 +--- a/plugins/ruby/CMakeLists.txt ++++ b/plugins/ruby/CMakeLists.txt +@@ -1,5 +1,5 @@ + # Allow build system to turn off downloading of libruby.so. +-OPTION(DOWNLOAD_RUBY "Download prebuilt libruby.so for ruby plugin." ON) ++OPTION(DOWNLOAD_RUBY "Download prebuilt libruby.so for ruby plugin." OFF) - IF (APPLE OR UNIX) - SET(RUBYAUTOGEN ruby-autogen-gcc.rb) + IF (DOWNLOAD_RUBY) |