JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #53149 from jtojnar/qrencode-cleanup

Browse Source 
qrencode: merge with libqrencode
This commit is contained in:
Jan Tojnar 2019-01-02 02:18:22 +01:00 committed by GitHub
commit b2b921bdca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 66 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/altcoins/namecoin.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, openssl, boost, libevent, autoreconfHook, db4, miniupnpc, eject, pkgconfig, qt4, protobuf, libqrencode, hexdump
{ stdenv, fetchFromGitHub, openssl, boost, libevent, autoreconfHook, db4, miniupnpc, eject, pkgconfig, qt4, protobuf, qrencode, hexdump
, withGui }:
with stdenv.lib;
@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
] ++ optionals withGui [
qt4
protobuf
libqrencode
qrencode
];
enableParallelBuilding = true;

4
pkgs/applications/audio/faust/faustlive.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub
, llvm, qt48Full, libqrencode, libmicrohttpd, libjack2, alsaLib, faust, curl
, llvm, qt48Full, qrencode, libmicrohttpd, libjack2, alsaLib, faust, curl
, bc, coreutils, which
}:
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [
llvm qt48Full libqrencode libmicrohttpd libjack2 alsaLib faust curl
llvm qt48Full qrencode libmicrohttpd libjack2 alsaLib faust curl
bc coreutils which
];

4
pkgs/applications/misc/digitalbitbox/default.nix
View File

@ -6,7 +6,7 @@
, libcap
, libevent
, libtool
, libqrencode
, qrencode
, udev
, libusb
, makeWrapper
@ -74,7 +74,7 @@ in stdenv.mkDerivation rec {
libtool
udev
libusb
libqrencode
qrencode
qtbase
qtwebsockets

4
pkgs/applications/misc/pwsafe/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig, zip, gettext, perl
, wxGTK31, libXi, libXt, libXtst, xercesc, xextproto
, libqrencode, libuuid, libyubikey, yubikey-personalization
, qrencode, libuuid, libyubikey, yubikey-personalization
}:
stdenv.mkDerivation rec {
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake pkgconfig zip ];
buildInputs = [
gettext perl libqrencode libuuid
gettext perl qrencode libuuid
libXi libXt libXtst wxGTK31 xercesc xextproto
libyubikey yubikey-personalization
];

4
pkgs/applications/networking/instant-messengers/toxic/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, libsodium, ncurses, curl
, libtoxcore, openal, libvpx, freealut, libconfig, pkgconfig, libopus
, libqrencode, gdk_pixbuf, libnotify }:
, qrencode, gdk_pixbuf, libnotify }:
stdenv.mkDerivation rec {
name = "toxic-${version}";
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
buildInputs = [
libtoxcore libsodium ncurses curl gdk_pixbuf libnotify
] ++ stdenv.lib.optionals (!stdenv.isAarch32) [
openal libopus libvpx freealut libqrencode
openal libopus libvpx freealut qrencode
];
nativeBuildInputs = [ pkgconfig libconfig ];

6
pkgs/development/haskell-modules/hackage-packages.nix generated
View File

@ -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

35
pkgs/development/libraries/libqrencode/default.nix
View File

@ -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;
};
}

47
pkgs/development/libraries/qrencode/default.nix Normal file
View File

@ -0,0 +1,47 @@
{ 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 ];
configureFlags = [
"--with-tests"
];
doCheck = true;
checkPhase = ''
runHook preCheck
pushd tests
./test_basic.sh
popd
runHook postCheck
'';
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;
};
}

2
pkgs/os-specific/linux/google-authenticator/default.nix
View File

@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
buildInputs = [ pam ];
preConfigure = ''
sed -i "s|libqrencode.so.4|${qrencode}/lib/libqrencode.so.4|" src/google-authenticator.c
sed -i "s|libqrencode.so.4|${qrencode.out}/lib/libqrencode.so.4|" src/google-authenticator.c
'';
installPhase = ''

21
pkgs/tools/graphics/qrencode/default.nix
View File

@ -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 ];
};
}

6
pkgs/tools/security/asc-key-to-qr-code-gif/default.nix
View File

@ -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 = ''

1
pkgs/top-level/aliases.nix
View File

@ -171,6 +171,7 @@ mapAliases ({
libjson_rpc_cpp = libjson-rpc-cpp; # added 2017-02-28
liblapackWithoutAtlas = liblapack; # added 2018-11-05
libmysql = mysql.connector-c; # added # 2017-12-28, this was a misnomer refering to libmysqlclient
libqrencode = qrencode; # added 2019-01-01
librecad2 = librecad; # backwards compatibility alias, added 2015-10
libsysfs = sysfsutils; # added 2018-04-25
libtidy = html-tidy; # added 2014-12-21

4
pkgs/top-level/all-packages.nix
View File

@ -3992,8 +3992,6 @@ in
libqmi = callPackage ../development/libraries/libqmi { };
libqrencode = callPackage ../development/libraries/libqrencode { };
libmbim = callPackage ../development/libraries/libmbim { };
libmongo-client = callPackage ../development/libraries/libmongo-client { };
@ -17404,7 +17402,7 @@ in
java = if stdenv.isLinux then jre else jdk;
};
qrencode = callPackage ../tools/graphics/qrencode { };
qrencode = callPackage ../development/libraries/qrencode { };
geeqie = callPackage ../applications/graphics/geeqie { };