From e5387aeef3dd6cb8293022c32c1002928cc4ff8b Mon Sep 17 00:00:00 2001 From: "Jason \"Don\" O'Conal" Date: Thu, 21 Nov 2013 03:46:02 +0000 Subject: [PATCH] rubyLibs.rmagick: add expression --- pkgs/development/interpreters/ruby/generated.nix | 12 ++++++++++++ pkgs/development/interpreters/ruby/patches.nix | 9 ++++++++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/ruby/generated.nix b/pkgs/development/interpreters/ruby/generated.nix index 8f84b414dbb..c106b6cbfaa 100644 --- a/pkgs/development/interpreters/ruby/generated.nix +++ b/pkgs/development/interpreters/ruby/generated.nix @@ -123,6 +123,7 @@ g: # Get dependencies from patched gems right_http_connection = g.right_http_connection_1_4_0; rjb = g.rjb_1_4_8; rkelly_remix = g.rkelly_remix_0_0_4; + rmagick = g.rmagick_2_13_2; rmail = g.rmail_1_0_0; rmail_sup = g.rmail_sup_1_0_1; rspec = g.rspec_2_11_0; @@ -2101,6 +2102,17 @@ in JSDuck. requiredGems = [ ]; sha256 = ''1w6yr5n3b8yd0rsba9q3zyxr0n2hbpkz4v2k1qx6j1ywvl9rc2c1''; }; + rmagick_2_13_2 = { + basename = ''rmagick''; + meta = { + description = ''Ruby binding to ImageMagick''; + homepage = ''http://rubyforge.org/projects/rmagick''; + longDescription = ''RMagick is an interface between Ruby and ImageMagick.''; + }; + name = ''rmagick-2.13.2''; + requiredGems = [ ]; + sha256 = ''1fw5rs5yqi5ayh44d18gjq68chiz14byx01h33c8jvkdxz3b9wz4''; + }; rmail_1_0_0 = { basename = ''rmail''; meta = { diff --git a/pkgs/development/interpreters/ruby/patches.nix b/pkgs/development/interpreters/ruby/patches.nix index 7c80cdfe065..c5ab0f5e5e2 100644 --- a/pkgs/development/interpreters/ruby/patches.nix +++ b/pkgs/development/interpreters/ruby/patches.nix @@ -1,5 +1,6 @@ { fetchurl, writeScript, ruby, ncurses, sqlite, libxml2, libxslt, libffi -, zlib, libuuid, gems, jdk, python, stdenv, libiconvOrEmpty }: +, zlib, libuuid, gems, jdk, python, stdenv, libiconvOrEmpty, imagemagick +, pkgconfig }: let @@ -76,6 +77,12 @@ in NIX_POST_EXTRACT_FILES_HOOK = patchUsrBinEnv; }; + rmagick = { + buildInputs = [ imagemagick pkgconfig ]; + + NIX_CFLAGS_COMPILE = "-I${imagemagick}/include/ImageMagick-6"; + }; + xrefresh_server = let patch = fetchurl {