qrencode: merge with libqrencode

This commit is contained in:
Jan Tojnar
2019-01-01 17:19:07 +01:00
parent 559916f648
commit c5c2ac4f45
13 changed files with 52 additions and 76 deletions
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, imagemagick, libqrencode
{ stdenv, fetchFromGitHub, imagemagick, qrencode
, testQR ? false, zbar ? null
}:
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
sha256 = "0yrc302a2fhbzryb10718ky4fymfcps3lk67ivis1qab5kbp6z8r";
};
buildInputs = [ imagemagick libqrencode ] ++ stdenv.lib.optional testQR zbar;
buildInputs = [ imagemagick qrencode ] ++ stdenv.lib.optional testQR zbar;
dontBuild = true;
dontStrip = true;
dontPatchELF = true;
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
preInstall = ''
substituteInPlace asc-to-gif.sh \
--replace "convert" "${imagemagick}/bin/convert" \
--replace "qrencode" "${libqrencode}/bin/qrencode"
--replace "qrencode" "${qrencode.bin}/bin/qrencode"
'';
installPhase = ''