diff options
| author | zimbatm <zimbatm@zimbatm.com> | 2016-02-23 23:13:12 +0000 |
|---|---|---|
| committer | zimbatm <zimbatm@zimbatm.com> | 2016-02-23 23:13:12 +0000 |
| commit | cdbaee7d4baf3af8aa1aff90d9cf0d651e77b84b (patch) | |
| tree | 1e8ae8f81b820ce673d44617eb34c63110f28ea5 /pkgs/development/interpreters/ruby | |
| parent | fa46b448d7b90c94547fdf11d3015b6857675b26 (diff) | |
| parent | c998447a13e8f97f2cfce648d019a26ee5c87bba (diff) | |
| download | nixlib-cdbaee7d4baf3af8aa1aff90d9cf0d651e77b84b.tar nixlib-cdbaee7d4baf3af8aa1aff90d9cf0d651e77b84b.tar.gz nixlib-cdbaee7d4baf3af8aa1aff90d9cf0d651e77b84b.tar.bz2 nixlib-cdbaee7d4baf3af8aa1aff90d9cf0d651e77b84b.tar.lz nixlib-cdbaee7d4baf3af8aa1aff90d9cf0d651e77b84b.tar.xz nixlib-cdbaee7d4baf3af8aa1aff90d9cf0d651e77b84b.tar.zst nixlib-cdbaee7d4baf3af8aa1aff90d9cf0d651e77b84b.zip | |
Merge pull request #12866 from nathan7/rubygem-drvname-fix
buildRubyGem: ensure gem versions don't get misparsed
Diffstat (limited to 'pkgs/development/interpreters/ruby')
| -rw-r--r-- | pkgs/development/interpreters/ruby/build-ruby-gem/default.nix | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/development/interpreters/ruby/build-ruby-gem/default.nix b/pkgs/development/interpreters/ruby/build-ruby-gem/default.nix index effd343ecfd9..db1ef4c6c439 100644 --- a/pkgs/development/interpreters/ruby/build-ruby-gem/default.nix +++ b/pkgs/development/interpreters/ruby/build-ruby-gem/default.nix @@ -32,7 +32,9 @@ lib.makeOverridable ( , platform ? "ruby" , ruby ? defs.ruby , stdenv ? ruby.stdenv -, namePrefix ? "${ruby.name}" + "-" +, namePrefix ? (let + rubyName = builtins.parseDrvName ruby.name; + in "${rubyName.name}${rubyName.version}-") , buildInputs ? [] , doCheck ? false , meta ? {} @@ -89,7 +91,7 @@ stdenv.mkDerivation (attrs // { ++ lib.optional stdenv.isDarwin darwin.libobjc ++ buildInputs; - name = attrs.name or (namePrefix + gemName); + name = attrs.name or "${namePrefix}${gemName}-${version}"; inherit src; |