diff options
Diffstat (limited to 'pkgs/development')
-rw-r--r-- | pkgs/development/haskell-modules/hackage-packages.nix | 6 | ||||
-rw-r--r-- | pkgs/development/libraries/libqrencode/default.nix | 35 | ||||
-rw-r--r-- | pkgs/development/libraries/qrencode/default.nix | 33 |
3 files changed, 36 insertions, 38 deletions
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index a6deacf7015..574c29f76da 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -171338,7 +171338,7 @@ self: { "qr-imager" = callPackage ({ mkDerivation, base, binary, bytestring, cryptonite, directory - , haskell-qrencode, hspec, jose-jwt, JuicyPixels, libqrencode + , haskell-qrencode, hspec, jose-jwt, JuicyPixels, qrencode , microlens, process, split, vector }: mkDerivation { @@ -171349,12 +171349,12 @@ self: { base binary bytestring cryptonite directory haskell-qrencode jose-jwt JuicyPixels microlens process split vector ]; - libraryPkgconfigDepends = [ libqrencode ]; + libraryPkgconfigDepends = [ qrencode ]; testHaskellDepends = [ base hspec ]; description = "Library to generate images"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) libqrencode;}; + }) {inherit (pkgs) qrencode;}; "qr-repa" = callPackage ({ mkDerivation, aeson, base, bytestring, cryptonite, directory diff --git a/pkgs/development/libraries/libqrencode/default.nix b/pkgs/development/libraries/libqrencode/default.nix deleted file mode 100644 index 7c1844bf281..00000000000 --- a/pkgs/development/libraries/libqrencode/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ stdenv, fetchurl, autoconf, automake, pkgconfig, - libtool, SDL2, libpng }: - -stdenv.mkDerivation rec { - name = "libqrencode-${version}"; - version = "4.0.0"; - - src = fetchurl { - url = "https://fukuchi.org/works/qrencode/qrencode-${version}.tar.gz"; - sha1 = "644054a76c8b593acb66a8c8b7dcf1b987c3d0b2"; - sha256 = "10da4q5pym7pzxcv21w2kc2rxmq7sp1rg58zdklwfr0jjci1nqjv"; - }; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ autoconf automake libtool SDL2 libpng ]; - - propagatedBuildInputs = [ SDL2 libpng ]; - - doCheck = true; - - meta = with stdenv.lib; { - homepage = https://fukuchi.org/works/qrencode/; - description = "A C library for encoding data in a QR Code symbol"; - - longDescription = '' - Libqrencode is a C library for encoding data in a QR Code symbol, - a kind of 2D symbology that can be scanned by handy terminals - such as a mobile phone with CCD. - ''; - - license = licenses.gpl2Plus; - maintainers = [ maintainers.adolfogc ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/qrencode/default.nix b/pkgs/development/libraries/qrencode/default.nix new file mode 100644 index 00000000000..7e6b20599af --- /dev/null +++ b/pkgs/development/libraries/qrencode/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchurl, pkgconfig, SDL2, libpng }: + +stdenv.mkDerivation rec { + pname = "qrencode"; + version = "4.0.2"; + + outputs = [ "bin" "out" "man" "dev" ]; + + src = fetchurl { + url = "https://fukuchi.org/works/qrencode/qrencode-${version}.tar.gz"; + sha256 = "079v3a15ydpr67zdi3xbgvic8n2kxvi0m32dyz8jaik10yffgayv"; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ SDL2 libpng ]; + + doCheck = true; + + meta = with stdenv.lib; { + homepage = https://fukuchi.org/works/qrencode/; + description = "C library for encoding data in a QR Code symbol"; + + longDescription = '' + Libqrencode is a C library for encoding data in a QR Code symbol, + a kind of 2D symbology that can be scanned by handy terminals + such as a mobile phone with CCD. + ''; + + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ adolfogc yegortimoshenko ]; + platforms = platforms.all; + }; +} |