Skip to content

Commit

Permalink
pcsctools: unbreak 'gscriptor' by adding cairo
Browse files Browse the repository at this point in the history
Fixes this:

  $ gscriptor
  Can't load '/nix/store/17w6hdwbli924v7d43xxxp66qhgqpc24-perl-Pango-1.227/lib/perl5/site_perl/5.22.2/x86_64-linux-thread-multi/auto/Pango/Pango.so' for module Pango: /nix/store/17w6hdwbli924v7d43xxxp66qhgqpc24-perl-Pango-1.227/lib/perl5/site_perl/5.22.2/x86_64-linux-thread-multi/auto/Pango/Pango.so: undefined symbol: cairo_font_type_to_sv at /nix/store/5z1wn7knhckr3a0asb8lzp99sdai09f2-perl-5.22.2/lib/perl5/5.22.2/x86_64-linux-thread-multi/DynaLoader.pm line 193.
   at /nix/store/srdac7af3nz6fb74haa8l8ls9wd9pas0-perl-Gtk2-1.2498/lib/perl5/site_perl/5.22.2/x86_64-linux-thread-multi/Gtk2.pm line 31.
  Compilation failed in require at /nix/store/srdac7af3nz6fb74haa8l8ls9wd9pas0-perl-Gtk2-1.2498/lib/perl5/site_perl/5.22.2/x86_64-linux-thread-multi/Gtk2.pm line 31.
  BEGIN failed--compilation aborted at /nix/store/srdac7af3nz6fb74haa8l8ls9wd9pas0-perl-Gtk2-1.2498/lib/perl5/site_perl/5.22.2/x86_64-linux-thread-multi/Gtk2.pm line 31.
  Compilation failed in require at /nix/store/sgy2xsyvmam09pl25x8gb507gyiz9ybn-pcsc-tools-1.4.25/bin/.gscriptor-wrapped line 28.
  BEGIN failed--compilation aborted at /nix/store/sgy2xsyvmam09pl25x8gb507gyiz9ybn-pcsc-tools-1.4.25/bin/.gscriptor-wrapped line 28.
  • Loading branch information
bjornfor committed Feb 17, 2017
1 parent fe45524 commit 73112a6
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions pkgs/tools/security/pcsctools/default.nix
@@ -1,6 +1,6 @@
{ stdenv, lib, fetchurl, makeWrapper, pkgconfig, udev, dbus_libs, pcsclite
, wget, coreutils
, perl, pcscperl, Glib, Gtk2, Pango
, perl, pcscperl, Glib, Gtk2, Pango, Cairo
}:

let deps = lib.makeBinPath [ wget coreutils ];
Expand All @@ -23,7 +23,7 @@ in stdenv.mkDerivation rec {
wrapProgram $out/bin/scriptor \
--set PERL5LIB "${lib.makePerlPath [ pcscperl ]}"
wrapProgram $out/bin/gscriptor \
--set PERL5LIB "${lib.makePerlPath [ pcscperl Glib Gtk2 Pango ]}"
--set PERL5LIB "${lib.makePerlPath [ pcscperl Glib Gtk2 Pango Cairo ]}"
wrapProgram $out/bin/ATR_analysis \
--set PERL5LIB "${lib.makePerlPath [ pcscperl ]}"
wrapProgram $out/bin/pcsc_scan \
Expand Down
2 changes: 1 addition & 1 deletion pkgs/top-level/all-packages.nix
Expand Up @@ -3324,7 +3324,7 @@ with pkgs;
};

pcsctools = callPackage ../tools/security/pcsctools {
inherit (perlPackages) pcscperl Glib Gtk2 Pango;
inherit (perlPackages) pcscperl Glib Gtk2 Pango Cairo;
};

pcsc-cyberjack = callPackage ../tools/security/pcsc-cyberjack { };
Expand Down

0 comments on commit 73112a6

Please sign in to comment.