diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2019-01-02 02:18:22 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-02 02:18:22 +0100 |
| commit | b2b921bdcaa82044df338e508fbb6348b8e7a344 (patch) | |
| tree | d48b538425397096ce03d4b2bc04a7b919f04de5 /pkgs/tools | |
| parent | 5c753f53d8bc74fe03c975db9e43570faf5ebc95 (diff) | |
| parent | 317249e5aec33c4995ee53ee11513ddd571e3b53 (diff) | |
| download | nixlib-b2b921bdcaa82044df338e508fbb6348b8e7a344.tar nixlib-b2b921bdcaa82044df338e508fbb6348b8e7a344.tar.gz nixlib-b2b921bdcaa82044df338e508fbb6348b8e7a344.tar.bz2 nixlib-b2b921bdcaa82044df338e508fbb6348b8e7a344.tar.lz nixlib-b2b921bdcaa82044df338e508fbb6348b8e7a344.tar.xz nixlib-b2b921bdcaa82044df338e508fbb6348b8e7a344.tar.zst nixlib-b2b921bdcaa82044df338e508fbb6348b8e7a344.zip | |
Merge pull request #53149 from jtojnar/qrencode-cleanup
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 = '' |