From f0be5119d9cf293d92d31967d6187bbd0b51e695 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com> Date: Sat, 1 Feb 2014 19:56:54 +0100 Subject: [PATCH] ruby/patches.nix: sort attributes alphabetically And remove trailing whitespace. --- .../development/interpreters/ruby/patches.nix | 98 +++++++++---------- 1 file changed, 49 insertions(+), 49 deletions(-) diff --git a/pkgs/development/interpreters/ruby/patches.nix b/pkgs/development/interpreters/ruby/patches.nix index c5ab0f5e5e20..10cbf1ecfe56 100644 --- a/pkgs/development/interpreters/ruby/patches.nix +++ b/pkgs/development/interpreters/ruby/patches.nix @@ -10,10 +10,29 @@ let find "$1" -type f -name "*.rb" | xargs sed -i "s@/usr/bin/env@$(type -p env)@g" find "$1" -type f -name "*.mk" | xargs sed -i "s@/usr/bin/env@$(type -p env)@g" ''; - + in { + buildr = { + # Many Buildfiles rely on RUBYLIB containing the current directory + # (as was the default in Ruby < 1.9.2). + extraWrapperFlags = "--prefix RUBYLIB : ."; + }; + + fakes3 = { + postInstall = '' + cd $out/${ruby.gemPath}/gems/* + patch -Np1 -i ${../../ruby-modules/fake-s3-list-bucket.patch} + ''; + }; + + ffi = { + postUnpack = "onetuh"; + buildFlags = ["--with-ffi-dir=${libffi}"]; + NIX_POST_EXTRACT_FILES_HOOK = patchUsrBinEnv; + }; + iconv = { buildInputs = [ libiconvOrEmpty ]; }; libv8 = { @@ -26,16 +45,16 @@ in # # Finally, we must set CC and AR explicitly to allow scons to find the # compiler and archiver - + preBuild = '' cat > $TMPDIR/g++ <<EOF #! ${stdenv.shell} $(export) - + g++ \$(echo \$@ | sed 's/-Werror//g') EOF chmod +x $TMPDIR/g++ - + export CXX=$TMPDIR/g++ export AR=$(type -p ar) ''; @@ -48,22 +67,18 @@ in done ''; }; - - sqlite3 = { propagatedBuildInputs = [ sqlite ]; }; - - rails = { gemFlags = "--no-ri --no-rdoc"; }; - + ncurses = { propagatedBuildInputs = [ ncurses ]; }; + ncursesw = { propagatedBuildInputs = [ ncurses ]; }; + nix = { postInstall = '' cd $out/${ruby.gemPath}/gems/nix* patch -Np1 -i ${./fix-gem-nix-versions.patch} ''; }; - - ncursesw = { propagatedBuildInputs = [ ncurses ]; }; - + nokogiri = { buildFlags = [ "--with-xml2-dir=${libxml2} --with-xml2-include=${libxml2}/include/libxml2" @@ -71,10 +86,13 @@ in ]; }; - ffi = { - postUnpack = "onetuh"; - buildFlags = ["--with-ffi-dir=${libffi}"]; - NIX_POST_EXTRACT_FILES_HOOK = patchUsrBinEnv; + pry = { gemFlags = "--no-ri --no-rdoc"; }; + + rails = { gemFlags = "--no-ri --no-rdoc"; }; + + rjb = { + buildInputs = [ jdk ]; + JAVA_HOME = jdk; }; rmagick = { @@ -83,6 +101,21 @@ in NIX_CFLAGS_COMPILE = "-I${imagemagick}/include/ImageMagick-6"; }; + sqlite3 = { propagatedBuildInputs = [ sqlite ]; }; + + xapian_full = { + buildInputs = [ gems.rake zlib libuuid ]; + gemFlags = "--no-rdoc --no-ri"; + }; + + xapian_full_alaveteli = { + buildInputs = [ zlib libuuid ]; + }; + + xapian_ruby = { + buildInputs = [ zlib libuuid ]; + }; + xrefresh_server = let patch = fetchurl { @@ -98,37 +131,4 @@ in zcat ${patch} | patch -p 1 ''; # */ }; - - xapian_full = { - buildInputs = [ gems.rake zlib libuuid ]; - gemFlags = "--no-rdoc --no-ri"; - }; - - xapian_full_alaveteli = { - buildInputs = [ zlib libuuid ]; - }; - - xapian_ruby = { - buildInputs = [ zlib libuuid ]; - }; - - rjb = { - buildInputs = [ jdk ]; - JAVA_HOME = jdk; - }; - - buildr = { - # Many Buildfiles rely on RUBYLIB containing the current directory - # (as was the default in Ruby < 1.9.2). - extraWrapperFlags = "--prefix RUBYLIB : ."; - }; - - pry = { gemFlags = "--no-ri --no-rdoc"; }; - - fakes3 = { - postInstall = '' - cd $out/${ruby.gemPath}/gems/* - patch -Np1 -i ${../../ruby-modules/fake-s3-list-bucket.patch} - ''; - }; }