Merge pull request #42339 from ookhoi/18.03-google-authenticator-failed-to-use-libqrencode

18.03-google-authenticator-failed-to-use-libqrencode - use libqrencod…
This commit is contained in:
Matthew Bauer
2018-06-28 22:12:22 -04:00
committed by GitHub
2 changed files with 5 additions and 5 deletions

View File

@@ -2,18 +2,18 @@
stdenv.mkDerivation rec {
name = "google-authenticator-libpam-${version}";
version = "1.03";
version = "1.05";
src = fetchurl {
url = "https://github.com/google/google-authenticator-libpam/archive/${version}.tar.gz";
sha256 = "0wb95z5v1w4sk0p7y9pbn4v95w9hrbf80vw9k2z2sgs0156ljkb7";
sha256 = "026vljmddi0zqcb3c0vdpabmi4r17kahc00mh6fs3qbyjbb14946";
};
nativeBuildInputs = [ autoreconfHook ];
buildInputs = [ pam ];
preConfigure = ''
sed -i "s|libqrencode.so.3|${qrencode}/lib/libqrencode.so.3|" src/google-authenticator.c
sed -i "s|libqrencode.so.4|${qrencode}/lib/libqrencode.so.4|" src/google-authenticator.c
'';
installPhase = ''

View File

@@ -1,11 +1,11 @@
{ stdenv, fetchurl, libpng, pkgconfig }:
stdenv.mkDerivation rec {
name = "qrencode-4.0.0";
name = "qrencode-4.0.2";
src = fetchurl {
url = "${meta.homepage}/${name}.tar.bz2";
sha256 = "02vx69fl52jbcrmnydsaxcmy6nxqm9jyxzd7hr07s491d7hka069";
sha256 = "1d2q5d3v8g3hsi3h5jq4n177bjhf3kawms09immw7p187f6jgjy9";
};
buildInputs = [ libpng ];