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 | |
| parent | 559916f6480b0cd745e52970dd1167ce7abbc6b1 (diff) | |
| download | nixlib-c5c2ac4f45959727b043b3478f28829fac36fffb.tar nixlib-c5c2ac4f45959727b043b3478f28829fac36fffb.tar.gz nixlib-c5c2ac4f45959727b043b3478f28829fac36fffb.tar.bz2 nixlib-c5c2ac4f45959727b043b3478f28829fac36fffb.tar.lz nixlib-c5c2ac4f45959727b043b3478f28829fac36fffb.tar.xz nixlib-c5c2ac4f45959727b043b3478f28829fac36fffb.tar.zst nixlib-c5c2ac4f45959727b043b3478f28829fac36fffb.zip | |
qrencode: merge with libqrencode
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/graphics/qrencode/default.nix | 21 | ||||
| -rw-r--r-- | pkgs/tools/security/asc-key-to-qr-code-gif/default.nix | 6 |
2 files changed, 3 insertions, 24 deletions
diff --git a/pkgs/tools/graphics/qrencode/default.nix b/pkgs/tools/graphics/qrencode/default.nix deleted file mode 100644 index 7c5aed9b4e23..000000000000 --- a/pkgs/tools/graphics/qrencode/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ stdenv, fetchurl, libpng, pkgconfig }: - -stdenv.mkDerivation rec { - name = "qrencode-4.0.2"; - - src = fetchurl { - url = "${meta.homepage}/${name}.tar.bz2"; - sha256 = "1d2q5d3v8g3hsi3h5jq4n177bjhf3kawms09immw7p187f6jgjy9"; - }; - - buildInputs = [ libpng ]; - nativeBuildInputs = [ pkgconfig ]; - - meta = with stdenv.lib; { - homepage = https://fukuchi.org/works/qrencode/; - description = "QR code encoder"; - platforms = platforms.all; - license = licenses.lgpl21Plus; - maintainers = with maintainers; [ yegortimoshenko ]; - }; -} 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 e04b41557482..ca2ea67e7881 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 = '' |