Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: bcbf45ff1f75
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: e6b7dcd1f675
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Jun 26, 2017

  1. dfhack: 0.43.05-alpha4 -> 0.43.05-r1

    @NickHu
    NickHu committed Jun 26, 2017

    Verified

    This commit was signed with the committer’s verified signature.
    eadwu Edmund Wu
    GPG key ID: 8AB0E99F622EC03E
    Verified
    Learn about vigilant mode
    Copy the full SHA
    24156c6 View commit details

Commits on Jun 27, 2017

  1. Merge pull request #26871 from NickHu/dfhack 

    dfhack: 0.43.05-alpha4 -> 0.43.05-r1
    @joachifm
    joachifm authored Jun 27, 2017

    Verified

    This commit was signed with the committer’s verified signature.
    eadwu Edmund Wu
    GPG key ID: 8AB0E99F622EC03E
    Verified
    Learn about vigilant mode
    Copy the full SHA
    e6b7dcd View commit details
Showing with 12 additions and 18 deletions.
  1. +3 −3 pkgs/games/dwarf-fortress/dfhack/default.nix
  2. +9 −15 pkgs/games/dwarf-fortress/dfhack/skip-ruby.patch
6 changes: 3 additions & 3 deletions pkgs/games/dwarf-fortress/dfhack/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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"
24 changes: 9 additions & 15 deletions pkgs/games/dwarf-fortress/dfhack/skip-ruby.patch
View file
Original file line number Diff line number Diff line change
@@ -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)