lol

ccid: properly build with new meson build files

Co-Authored-By: Emily <vcs@emily.moe>

authored by

FliegendeWurst
Emily
and committed by
Anthony Roussel
30ad4bb0 5650eb70

+18 -7
+18 -7
pkgs/by-name/cc/ccid/package.nix
··· 5 5 flex, 6 6 gitUpdater, 7 7 libusb1, 8 + meson, 9 + ninja, 8 10 pcsclite, 9 11 perl, 10 12 pkg-config, ··· 22 24 23 25 postPatch = '' 24 26 patchShebangs . 25 - substituteInPlace src/Makefile.am --replace-fail /bin/echo echo 27 + substituteInPlace meson.build --replace-fail \ 28 + "pcsc_dep.get_variable('usbdropdir')" \ 29 + "'$out/pcsc/drivers'" 26 30 ''; 27 31 28 - configureFlags = [ 29 - "--enable-twinserial" 30 - "--enable-serialconfdir=${placeholder "out"}/etc/reader.conf.d" 31 - "--enable-ccidtwindir=${placeholder "out"}/pcsc/drivers/serial" 32 - "--enable-usbdropdir=${placeholder "out"}/pcsc/drivers" 32 + mesonFlags = [ 33 + (lib.mesonBool "serial" true) 33 34 ]; 34 35 35 36 # error: call to undeclared function 'InterruptRead'; ··· 42 43 flex 43 44 perl 44 45 pkg-config 46 + meson 47 + ninja 45 48 ]; 46 49 47 50 buildInputs = [ ··· 51 54 ]; 52 55 53 56 postInstall = '' 54 - install -Dm 0444 -t $out/lib/udev/rules.d src/92_pcscd_ccid.rules 57 + install -Dm 0444 -t $out/lib/udev/rules.d ../src/92_pcscd_ccid.rules 55 58 substituteInPlace $out/lib/udev/rules.d/92_pcscd_ccid.rules \ 56 59 --replace-fail "/usr/sbin/pcscd" "${pcsclite}/bin/pcscd" 57 60 ''; ··· 63 66 passthru.updateScript = gitUpdater { 64 67 url = "https://salsa.debian.org/rousseau/CCID.git"; 65 68 }; 69 + 70 + installCheckPhase = '' 71 + [ -f $out/etc/reader.conf.d/libccidtwin ] 72 + [ -f $out/lib/udev/rules.d/92_pcscd_ccid.rules ] 73 + [ -f $out/pcsc/drivers/ifd-ccid.bundle/Contents/Info.plist ] 74 + [ -f $out/pcsc/drivers/ifd-ccid.bundle/Contents/Linux/libccid.so ] 75 + [ -f $out/pcsc/drivers/serial/libccidtwin.so ] 76 + ''; 66 77 67 78 meta = with lib; { 68 79 description = "PC/SC driver for USB CCID smart card readers";