MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-16 14:54:29 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge pull request #12866 from nathan7/rubygem-drvname-fix

Browse source 
buildRubyGem: ensure gem versions don't get misparsed
This commit is contained in:
zimbatm 2016-02-23 23:13:12 +00:00
commit cdbaee7d4b
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/development/interpreters/ruby/build-ruby-gem/default.nix
View file

@ -32,7 +32,9 @@ lib.makeOverridable (
, platform ? "ruby" , platform ? "ruby"
, ruby ? defs.ruby , ruby ? defs.ruby
, stdenv ? ruby.stdenv , stdenv ? ruby.stdenv
, namePrefix ? "${ruby.name}" + "-" , namePrefix ? (let
rubyName = builtins.parseDrvName ruby.name;
in "${rubyName.name}${rubyName.version}-")
, buildInputs ? [] , buildInputs ? []
, doCheck ? false , doCheck ? false
, meta ? {} , meta ? {}
@ -89,7 +91,7 @@ stdenv.mkDerivation (attrs // {
++ lib.optional stdenv.isDarwin darwin.libobjc ++ lib.optional stdenv.isDarwin darwin.libobjc
++ buildInputs; ++ buildInputs;
name = attrs.name or (namePrefix + gemName); name = attrs.name or "${namePrefix}${gemName}-${version}";
inherit src; inherit src;