diff --git a/pkgs/development/interpreters/ruby/ruby-1.8.7.nix b/pkgs/development/interpreters/ruby/ruby-1.8.7.nix index 9b43368c617..c4fc52279b6 100644 --- a/pkgs/development/interpreters/ruby/ruby-1.8.7.nix +++ b/pkgs/development/interpreters/ruby/ruby-1.8.7.nix @@ -88,7 +88,8 @@ stdenv.mkDerivation rec { minorVersion = "8"; teenyVersion = "7"; patchLevel = "374"; - libPath = "lib/ruby/${majorVersion}.${minorVersion}"; - gemPath = "lib/ruby/gems/${majorVersion}.${minorVersion}"; + rubyEngine = "ruby"; + libPath = "lib/${rubyEngine}/${majorVersion}.${minorVersion}.${teenyVersion}"; + gemPath = "lib/${rubyEngine}/gems/${majorVersion}.${minorVersion}.${teenyVersion}"; }; } diff --git a/pkgs/development/interpreters/ruby/ruby-1.9.3.nix b/pkgs/development/interpreters/ruby/ruby-1.9.3.nix index 77880870dd9..55c7ef6675e 100644 --- a/pkgs/development/interpreters/ruby/ruby-1.9.3.nix +++ b/pkgs/development/interpreters/ruby/ruby-1.9.3.nix @@ -112,7 +112,8 @@ stdenv.mkDerivation rec { minorVersion = "9"; teenyVersion = "3"; patchLevel = "547"; - libPath = "lib/ruby/${majorVersion}.${minorVersion}"; - gemPath = "lib/ruby/gems/${majorVersion}.${minorVersion}"; + rubyEngine = "ruby"; + libPath = "lib/${rubyEngine}/${majorVersion}.${minorVersion}.${teenyVersion}"; + gemPath = "lib/${rubyEngine}/gems/${majorVersion}.${minorVersion}.${teenyVersion}"; }; } diff --git a/pkgs/development/interpreters/ruby/ruby-2.0.0.nix b/pkgs/development/interpreters/ruby/ruby-2.0.0.nix index 4c3344f7672..ddad429cb5c 100644 --- a/pkgs/development/interpreters/ruby/ruby-2.0.0.nix +++ b/pkgs/development/interpreters/ruby/ruby-2.0.0.nix @@ -97,7 +97,8 @@ stdenv.mkDerivation rec { minorVersion = "0"; teenyVersion = "0"; patchLevel = "481"; - libPath = "lib/ruby/${majorVersion}.${minorVersion}"; - gemPath = "lib/ruby/gems/${majorVersion}.${minorVersion}"; + rubyEngine = "ruby"; + libPath = "lib/${rubyEngine}/${majorVersion}.${minorVersion}.${teenyVersion}"; + gemPath = "lib/${rubyEngine}/gems/${majorVersion}.${minorVersion}.${teenyVersion}"; }; } diff --git a/pkgs/development/interpreters/ruby/ruby-2.1.0.nix b/pkgs/development/interpreters/ruby/ruby-2.1.0.nix index afe4cbef79d..178ebdf17be 100644 --- a/pkgs/development/interpreters/ruby/ruby-2.1.0.nix +++ b/pkgs/development/interpreters/ruby/ruby-2.1.0.nix @@ -112,7 +112,8 @@ stdenv.mkDerivation rec { minorVersion = "1"; teenyVersion = "0"; patchLevel = "0"; - libPath = "lib/ruby/${majorVersion}.${minorVersion}"; - gemPath = "lib/ruby/gems/${majorVersion}.${minorVersion}"; + rubyEngine = "ruby"; + libPath = "lib/${rubyEngine}/${majorVersion}.${minorVersion}.${teenyVersion}"; + gemPath = "lib/${rubyEngine}/gems/${majorVersion}.${minorVersion}.${teenyVersion}"; }; } diff --git a/pkgs/development/interpreters/ruby/ruby-2.1.1.nix b/pkgs/development/interpreters/ruby/ruby-2.1.1.nix index d87526b1570..27628a2cd7e 100644 --- a/pkgs/development/interpreters/ruby/ruby-2.1.1.nix +++ b/pkgs/development/interpreters/ruby/ruby-2.1.1.nix @@ -111,7 +111,8 @@ stdenv.mkDerivation rec { minorVersion = "1"; teenyVersion = "1"; patchLevel = "0"; - libPath = "lib/ruby/${majorVersion}.${minorVersion}"; - gemPath = "lib/ruby/gems/${majorVersion}.${minorVersion}"; + rubyEngine = "ruby"; + libPath = "lib/${rubyEngine}/${majorVersion}.${minorVersion}.${teenyVersion}"; + gemPath = "lib/${rubyEngine}/gems/${majorVersion}.${minorVersion}.${teenyVersion}"; }; } diff --git a/pkgs/development/interpreters/ruby/ruby-2.1.2.nix b/pkgs/development/interpreters/ruby/ruby-2.1.2.nix index e2ee74fac2d..0de24a9df03 100644 --- a/pkgs/development/interpreters/ruby/ruby-2.1.2.nix +++ b/pkgs/development/interpreters/ruby/ruby-2.1.2.nix @@ -110,7 +110,8 @@ stdenv.mkDerivation rec { minorVersion = "1"; teenyVersion = "2"; patchLevel = "353"; - libPath = "lib/ruby/${majorVersion}.${minorVersion}"; - gemPath = "lib/ruby/gems/${majorVersion}.${minorVersion}"; + rubyEngine = "ruby"; + libPath = "lib/${rubyEngine}/${majorVersion}.${minorVersion}.${teenyVersion}"; + gemPath = "lib/${rubyEngine}/gems/${majorVersion}.${minorVersion}.${teenyVersion}"; }; } diff --git a/pkgs/development/interpreters/ruby/ruby-2.1.3.nix b/pkgs/development/interpreters/ruby/ruby-2.1.3.nix index 0f8b2512322..04882a58bd4 100644 --- a/pkgs/development/interpreters/ruby/ruby-2.1.3.nix +++ b/pkgs/development/interpreters/ruby/ruby-2.1.3.nix @@ -108,7 +108,8 @@ stdenv.mkDerivation rec { minorVersion = "1"; teenyVersion = "3"; patchLevel = "0"; - libPath = "lib/ruby/${majorVersion}.${minorVersion}"; - gemPath = "lib/ruby/gems/${majorVersion}.${minorVersion}"; + rubyEngine = "ruby"; + libPath = "lib/${rubyEngine}/${majorVersion}.${minorVersion}.${teenyVersion}"; + gemPath = "lib/${rubyEngine}/gems/${majorVersion}.${minorVersion}.${teenyVersion}"; }; }