ruby: fixup mpdcron

+45 -8
-2
pkgs/applications/networking/mailreaders/sup/.bundle/config
··· 1 - --- 2 - BUNDLE_NO_INSTALL: true
+1 -2
pkgs/development/interpreters/ruby/bundler-env/default-gem-config.nix
··· 63 63 "--with-xslt-include=${libxslt}/include" 64 64 "--with-exslt-lib=${libxslt}/lib" 65 65 "--with-exslt-include=${libxslt}/include" 66 - "--with-iconv-dir=${libiconv}" 67 - ]; 66 + ] ++ lib.optional stdenv.isDarwin "--with-iconv-dir=${libiconv}"; 68 67 }; 69 68 70 69 pg = attrs: {
+2
pkgs/tools/audio/mpdcron/Gemfile
··· 1 + source "https://rubygems.org" 2 + gem "nokogiri"
+12
pkgs/tools/audio/mpdcron/Gemfile.lock
··· 1 + GEM 2 + remote: https://rubygems.org/ 3 + specs: 4 + mini_portile (0.6.2) 5 + nokogiri (1.6.5) 6 + mini_portile (~> 0.6.0) 7 + 8 + PLATFORMS 9 + ruby 10 + 11 + DEPENDENCIES 12 + nokogiri
+11 -4
pkgs/tools/audio/mpdcron/default.nix
··· 1 1 { stdenv, fetchgit, autoconf, automake, libtool, pkgconfig, glib, libdaemon, buildRubyGem 2 - , mpd_clientlib, curl, sqlite, ruby, rubyPackages, libnotify, pandoc }: 2 + , mpd_clientlib, curl, sqlite, ruby, bundlerEnv, libnotify, pandoc }: 3 3 4 - stdenv.mkDerivation rec { 4 + let 5 + gemEnv = bundlerEnv { 6 + name = "mpdcron-bundle"; 7 + gemfile = ./Gemfile; 8 + lockfile = ./Gemfile.lock; 9 + gemset = ./gemset.nix; 10 + }; 11 + in stdenv.mkDerivation rec { 5 12 version = "20130809"; 6 13 name = "mpdcron-${version}"; 7 14 ··· 20 27 }; 21 28 22 29 buildInputs = 23 - [ autoconf automake libtool pkgconfig glib libdaemon haskellPackages.pandoc 24 - mpd_clientlib curl sqlite ruby /*nokogiri*/ libnotify ]; 30 + [ autoconf automake libtool pkgconfig glib libdaemon pandoc 31 + mpd_clientlib curl sqlite ruby gemEnv libnotify ]; 25 32 26 33 preConfigure = '' 27 34 ./autogen.sh
+19
pkgs/tools/audio/mpdcron/gemset.nix
··· 1 + { 2 + "mini_portile" = { 3 + version = "0.6.2"; 4 + source = { 5 + type = "gem"; 6 + sha256 = "0h3xinmacscrnkczq44s6pnhrp4nqma7k056x5wv5xixvf2wsq2w"; 7 + }; 8 + }; 9 + "nokogiri" = { 10 + version = "1.6.5"; 11 + source = { 12 + type = "gem"; 13 + sha256 = "1xmxz6fa0m4p7c7ngpgz6gjgv65lzz63dsf0b6vh7gs2fkiw8j7l"; 14 + }; 15 + dependencies = [ 16 + "mini_portile" 17 + ]; 18 + }; 19 + }