MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-16 23:03:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

ruby/patches.nix: sort attributes alphabetically

Browse source 
And remove trailing whitespace.
This commit is contained in:
Bjørn Forsman 2014-02-01 19:56:54 +01:00
parent 40f202e4a0
commit f0be5119d9
1 changed files with 49 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

98
pkgs/development/interpreters/ruby/patches.nix
View file

@ -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 "*.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" find "$1" -type f -name "*.mk" | xargs sed -i "s@/usr/bin/env@$(type -p env)@g"
''; '';
in 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 ]; }; iconv = { buildInputs = [ libiconvOrEmpty ]; };
libv8 = { libv8 = {
@ -26,16 +45,16 @@ in
# #
# Finally, we must set CC and AR explicitly to allow scons to find the # Finally, we must set CC and AR explicitly to allow scons to find the
# compiler and archiver # compiler and archiver
preBuild = '' preBuild = ''
cat > $TMPDIR/g++ <<EOF cat > $TMPDIR/g++ <<EOF
#! ${stdenv.shell} #! ${stdenv.shell}
$(export) $(export)
g++ \$(echo \$@ | sed 's/-Werror//g') g++ \$(echo \$@ | sed 's/-Werror//g')
EOF EOF
chmod +x $TMPDIR/g++ chmod +x $TMPDIR/g++
export CXX=$TMPDIR/g++ export CXX=$TMPDIR/g++
export AR=$(type -p ar) export AR=$(type -p ar)
''; '';
@ -48,22 +67,18 @@ in
done done
''; '';
}; };
sqlite3 = { propagatedBuildInputs = [ sqlite ]; };
rails = { gemFlags = "--no-ri --no-rdoc"; };
ncurses = { propagatedBuildInputs = [ ncurses ]; }; ncurses = { propagatedBuildInputs = [ ncurses ]; };
ncursesw = { propagatedBuildInputs = [ ncurses ]; };
nix = { nix = {
postInstall = '' postInstall = ''
cd $out/${ruby.gemPath}/gems/nix* cd $out/${ruby.gemPath}/gems/nix*
patch -Np1 -i ${./fix-gem-nix-versions.patch} patch -Np1 -i ${./fix-gem-nix-versions.patch}
''; '';
}; };
ncursesw = { propagatedBuildInputs = [ ncurses ]; };
nokogiri = { nokogiri = {
buildFlags = buildFlags =
[ "--with-xml2-dir=${libxml2} --with-xml2-include=${libxml2}/include/libxml2" [ "--with-xml2-dir=${libxml2} --with-xml2-include=${libxml2}/include/libxml2"
@ -71,10 +86,13 @@ in
]; ];
}; };
ffi = { pry = { gemFlags = "--no-ri --no-rdoc"; };
postUnpack = "onetuh";
buildFlags = ["--with-ffi-dir=${libffi}"]; rails = { gemFlags = "--no-ri --no-rdoc"; };
NIX_POST_EXTRACT_FILES_HOOK = patchUsrBinEnv;
rjb = {
buildInputs = [ jdk ];
JAVA_HOME = jdk;
}; };
rmagick = { rmagick = {
@ -83,6 +101,21 @@ in
NIX_CFLAGS_COMPILE = "-I${imagemagick}/include/ImageMagick-6"; 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 = xrefresh_server =
let let
patch = fetchurl { patch = fetchurl {
@ -98,37 +131,4 @@ in
zcat ${patch} | patch -p 1 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}
'';
};
} }