libopensc-dnie: fix reference to opensc

The package is still broken, though.
This commit is contained in:
Peter Simons 2013-12-02 13:26:21 +01:00
parent 82da6e6c04
commit 38418526e0
2 changed files with 8 additions and 12 deletions

@ -1,12 +1,10 @@
{stdenv, fetchurl, writeScript, patchelf, glib, opensc, openssl, openct, libtool, pcsclite,
zlib}:
# Version 1.4.6-2 works only with opensc 0.11.7
assert opensc.name == "opensc-0.11.7";
{ stdenv, fetchurl, writeScript, patchelf, glib, opensc, openssl, openct
, libtool, pcsclite, zlib
}:
stdenv.mkDerivation rec {
name = "libopensc-dnie-1.4.6-2";
src = if stdenv.system == "i686-linux" then (fetchurl {
url = http://www.dnielectronico.es/descargas/PKCS11_para_Sistemas_Unix/1.4.6.Ubuntu_Jaunty_32/Ubuntu_Jaunty_opensc-dnie_1.4.6-2_i386.deb.tar;
sha256 = "1i6r9ahjr0rkcxjfzkg2rrib1rjsjd5raxswvvfiya98q8rlv39i";
@ -26,14 +24,14 @@ stdenv.mkDerivation rec {
RPATH=${glib}/lib:${opensc}/lib:${openssl}/lib:${openct}/lib:${libtool}/lib:${pcsclite}/lib:${stdenv.gcc.libc}/lib:${zlib}/lib
for a in usr/lib/*.so*; do
for a in "usr/lib/"*.so*; do
if ! test -L $a; then
patchelf --set-rpath $RPATH $a
fi
done
sed -i s,/usr,$out, usr/lib/pkgconfig/*
sed -i s,/usr,$out, "usr/lib/pkgconfig/"*
mkdir -p $out
cp -R usr/lib $out
cp -R usr/share $out

@ -5377,9 +5377,7 @@ let
openlierox = callPackage ../games/openlierox { };
libopensc_dnie = callPackage ../development/libraries/libopensc-dnie {
opensc = opensc_0_11_7;
};
libopensc_dnie = callPackage ../development/libraries/libopensc-dnie { };
opencolorio = callPackage ../development/libraries/opencolorio { };