From 42b1fdaec58808c58116bd89e882ee4435885b3a Mon Sep 17 00:00:00 2001 From: Michael Fellinger Date: Thu, 6 Jul 2017 11:45:30 +0200 Subject: [PATCH] bundix: 2.2.0 -> 2.3.1 --- .../ruby-modules/bundix/default.nix | 31 ++++++++----------- 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/pkgs/development/ruby-modules/bundix/default.nix b/pkgs/development/ruby-modules/bundix/default.nix index 8ccc6dbf306f..0caa8b226f08 100644 --- a/pkgs/development/ruby-modules/bundix/default.nix +++ b/pkgs/development/ruby-modules/bundix/default.nix @@ -1,35 +1,30 @@ -{ buildRubyGem, fetchFromGitHub, lib, bundler, ruby, nix, nix-prefetch-git }: +{ buildRubyGem, fetchFromGitHub, makeWrapper, lib, bundler, ruby, nix, + nix-prefetch-git }: buildRubyGem rec { inherit ruby; name = "${gemName}-${version}"; gemName = "bundix"; - version = "2.2.1"; + version = "2.3.1"; src = fetchFromGitHub { owner = "manveru"; repo = "bundix"; rev = version; - sha256 = "1gh90yxm4k27jdjdl3r31fcg4sk7k54jlbw1zfm1p9q3i7k8x4i7"; + sha256 = "0ap23abv6chiv7v97ic6b1qf5by6b26as5yrpxg5q7p2giyiv33v"; }; - buildInputs = [bundler]; + buildInputs = [ ruby bundler ]; + nativeBuildInputs = [ makeWrapper ]; - postInstall = '' - substituteInPlace $GEM_HOME/gems/${gemName}-${version}/lib/bundix.rb \ - --replace \ - "'nix-instantiate'" \ - "'${nix.out}/bin/nix-instantiate'" \ - --replace \ - "'nix-hash'" \ - "'${nix.out}/bin/nix-hash'" \ - --replace \ - "'nix-prefetch-url'" \ - "'${nix.out}/bin/nix-prefetch-url'" \ - --replace \ - "'nix-prefetch-git'" \ - "'${nix-prefetch-git}/bin/nix-prefetch-git'" + preFixup = '' + wrapProgram $out/bin/bundix \ + --prefix PATH : "${nix.out}/bin" \ + --prefix PATH : "${nix-prefetch-git.out}/bin" \ + --prefix PATH : "${bundler.out}/bin" \ + --set GEM_HOME "${bundler}/${bundler.ruby.gemPath}" \ + --set GEM_PATH "${bundler}/${bundler.ruby.gemPath}" ''; meta = {