diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2019-01-01 17:19:07 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2019-01-01 17:19:07 +0100 |
| commit | c5c2ac4f45959727b043b3478f28829fac36fffb (patch) | |
| tree | 6ae91c6eaf225617ecb248df10c388e0a6197cba /pkgs/tools/security/asc-key-to-qr-code-gif | |
| parent | 559916f6480b0cd745e52970dd1167ce7abbc6b1 (diff) | |
| download | nixpkgs-c5c2ac4f45959727b043b3478f28829fac36fffb.tar nixpkgs-c5c2ac4f45959727b043b3478f28829fac36fffb.tar.gz nixpkgs-c5c2ac4f45959727b043b3478f28829fac36fffb.tar.bz2 nixpkgs-c5c2ac4f45959727b043b3478f28829fac36fffb.tar.lz nixpkgs-c5c2ac4f45959727b043b3478f28829fac36fffb.tar.xz nixpkgs-c5c2ac4f45959727b043b3478f28829fac36fffb.tar.zst nixpkgs-c5c2ac4f45959727b043b3478f28829fac36fffb.zip | |
qrencode: merge with libqrencode
Diffstat (limited to 'pkgs/tools/security/asc-key-to-qr-code-gif')
| -rw-r--r-- | pkgs/tools/security/asc-key-to-qr-code-gif/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/tools/security/asc-key-to-qr-code-gif/default.nix b/pkgs/tools/security/asc-key-to-qr-code-gif/default.nix index e04b4155748..ca2ea67e788 100644 --- a/pkgs/tools/security/asc-key-to-qr-code-gif/default.nix +++ b/pkgs/tools/security/asc-key-to-qr-code-gif/default.nix @@ -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 = '' |