mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-12-27 05:43:50 +03:00
bins: init at 1.1.29
This commit is contained in:
parent
e5ea52e1eb
commit
7fe0c342a3
20
pkgs/tools/graphics/bins/bins_edit-isa.patch
Normal file
20
pkgs/tools/graphics/bins/bins_edit-isa.patch
Normal file
@ -0,0 +1,20 @@
|
||||
--- a/bins_edit 2005-08-25 14:34:39.000000000 -0400
|
||||
+++ b/bins_edit 2016-05-18 20:25:40.913460314 -0400
|
||||
@@ -26,7 +26,7 @@
|
||||
|
||||
use Getopt::Long;
|
||||
use IO::File;
|
||||
-use UNIVERSAL qw(isa);
|
||||
+use Scalar::Util 'reftype';
|
||||
|
||||
# XML parsing & writing
|
||||
use XML::Grove;
|
||||
@@ -198,7 +198,7 @@
|
||||
my $fieldValue;
|
||||
foreach my $element
|
||||
(@{$document->at_path('/'.$fileType.'/description')->{Contents}}) {
|
||||
- if (isa($element, 'XML::Grove::Element') && $element->{Name} eq "field") {
|
||||
+ if (reftype($element) eq 'XML::Grove::Element' && $element->{Name} eq "field") {
|
||||
$fieldName = $element->{Attributes}{'name'};
|
||||
$fieldValue = "";
|
||||
if ($fieldName eq $field) {
|
48
pkgs/tools/graphics/bins/default.nix
Normal file
48
pkgs/tools/graphics/bins/default.nix
Normal file
@ -0,0 +1,48 @@
|
||||
{ stdenv, fetchurl, makeWrapper, perl, perlPackages }:
|
||||
|
||||
let
|
||||
version = "1.1.29";
|
||||
|
||||
in
|
||||
|
||||
#note: bins-edit-gui does not work
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "bins-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://download.gna.org/bins/bins-${version}.tar.gz";
|
||||
sha256 = "0n4pcssyaic4xbk25aal0b3g0ibmi2f3gpv0gsnaq61sqipyjl94";
|
||||
};
|
||||
|
||||
buildInputs = with perlPackages; [ makeWrapper perl
|
||||
ImageSize ImageInfo PerlMagick
|
||||
URI HTMLParser HTMLTemplate HTMLClean
|
||||
XMLGrove XMLHandlerYAWriter
|
||||
TextIconv TextUnaccent
|
||||
DateTimeFormatDateParse ]; #TODO need Gtk (not Gtk2?) for bins-edit-gui
|
||||
|
||||
patches = [ ./bins_edit-isa.patch
|
||||
./hashref.patch ];
|
||||
|
||||
installPhase = ''
|
||||
export DESTDIR=$out;
|
||||
export PREFIX=.;
|
||||
|
||||
echo | ./install.sh
|
||||
|
||||
for f in bins bins_edit bins-edit-gui; do
|
||||
substituteInPlace $out/bin/$f \
|
||||
--replace /usr/bin/perl ${perl}/bin/perl \
|
||||
--replace /etc/bins $out/etc/bins \
|
||||
--replace /usr/local/share $out/share;
|
||||
wrapProgram $out/bin/$f --set PERL5LIB "$PERL5LIB";
|
||||
done
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "generates static HTML photo albums";
|
||||
homepage = http://bins.sautret.org;
|
||||
license = stdenv.lib.licenses.gpl2;
|
||||
};
|
||||
}
|
13
pkgs/tools/graphics/bins/hashref.patch
Normal file
13
pkgs/tools/graphics/bins/hashref.patch
Normal file
@ -0,0 +1,13 @@
|
||||
--- a/bins 2016-05-18 20:45:49.513330005 -0400
|
||||
+++ b/bins 2016-05-18 20:58:58.957830874 -0400
|
||||
@@ -3643,8 +3643,8 @@
|
||||
|
||||
my @descTable;
|
||||
foreach my $tagName (@mainFields) {
|
||||
- if (${%$hashref}{$tagName}) {
|
||||
- my $value=${%$hashref}{$tagName};
|
||||
+ if (${$hashref}{$tagName}) {
|
||||
+ my $value=${$hashref}{$tagName};
|
||||
$value =~ s/'/'/g ; # in case it's used in javascript code
|
||||
push @descTable, {DESC_FIELD_NAME => getFields($configHash)->{$tagName}->{'Name'},
|
||||
DESC_FIELD_VALUE => $value,
|
@ -586,6 +586,8 @@ in
|
||||
|
||||
bindfs = callPackage ../tools/filesystems/bindfs { };
|
||||
|
||||
bins = callPackage ../tools/graphics/bins { };
|
||||
|
||||
binwalk = callPackage ../tools/misc/binwalk {
|
||||
python = pythonFull;
|
||||
wrapPython = pythonPackages.wrapPython;
|
||||
|
Loading…
Reference in New Issue
Block a user