diff options
Diffstat (limited to 'pkgs/development/interpreters')
-rw-r--r-- | pkgs/development/interpreters/angelscript/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/interpreters/ruby/default.nix | 1 | ||||
-rw-r--r-- | pkgs/development/interpreters/ruby/gem.nix | 3 | ||||
-rw-r--r-- | pkgs/development/interpreters/ruby/patches.nix | 7 |
4 files changed, 11 insertions, 4 deletions
diff --git a/pkgs/development/interpreters/angelscript/default.nix b/pkgs/development/interpreters/angelscript/default.nix index 65ff72bae56f8..fa53071d306af 100644 --- a/pkgs/development/interpreters/angelscript/default.nix +++ b/pkgs/development/interpreters/angelscript/default.nix @@ -11,10 +11,10 @@ let (builtins.attrNames (builtins.removeAttrs x helperArgNames)); sourceInfo = rec { baseName="angelscript"; - version="2.20.2"; + version="2.22.1"; name="${baseName}-${version}"; url="http://www.angelcode.com/angelscript/sdk/files/angelscript_${version}.zip"; - hash="0s5d6av27dl6kxkzns011zwznj7r8zy5ypfhl6x9r1kzaqdkqz2a"; + hash="0fmw0cb7ymgyq31r4cfvsn4k86r20hj650fbzs9i7zl0p3lb6hpm"; }; in rec { diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix deleted file mode 100644 index 550edcc004aa1..0000000000000 --- a/pkgs/development/interpreters/ruby/default.nix +++ /dev/null @@ -1 +0,0 @@ -import ./ruby-19.nix diff --git a/pkgs/development/interpreters/ruby/gem.nix b/pkgs/development/interpreters/ruby/gem.nix index a64f10e268ccd..8ec80b785de0a 100644 --- a/pkgs/development/interpreters/ruby/gem.nix +++ b/pkgs/development/interpreters/ruby/gem.nix @@ -31,7 +31,8 @@ let wrapProgram "$prog" \ --prefix GEM_PATH : "$GEM_PATH" \ --prefix RUBYLIB : "${rubygems}/lib" \ - --set RUBYOPT 'rubygems' + --set RUBYOPT rubygems \ + $extraWrapperFlags ''${extraWrapperFlagsArray[@]} done for prog in $out/gems/*/bin/*; do diff --git a/pkgs/development/interpreters/ruby/patches.nix b/pkgs/development/interpreters/ruby/patches.nix index 37f103f7772d4..a2d2d753a4af8 100644 --- a/pkgs/development/interpreters/ruby/patches.nix +++ b/pkgs/development/interpreters/ruby/patches.nix @@ -61,4 +61,11 @@ in buildInputs = [ jdk ]; JAVA_HOME = jdk; }; + + buildr = { + # Many Buildfiles rely on RUBYLIB containing the current directory + # (as was the default in Ruby < 1.9.2). + extraWrapperFlags = "--prefix RUBYLIB : ."; + }; + } |