mirror of
https://github.com/wlcx/home.git
synced 2026-09-09 17:58:22 +01:00
Format with alejandra
This commit is contained in:
+4
-4
@@ -1,6 +1,6 @@
|
||||
# TODO: auto import everything
|
||||
{ pkgs, ... }: {
|
||||
qrclip = pkgs.callPackage ./qrclip { };
|
||||
zbar = pkgs.callPackage ./zbar { };
|
||||
yubikey-manager = pkgs.callPackage ./yubikey-manager { };
|
||||
{pkgs, ...}: {
|
||||
qrclip = pkgs.callPackage ./qrclip {};
|
||||
zbar = pkgs.callPackage ./zbar {};
|
||||
yubikey-manager = pkgs.callPackage ./yubikey-manager {};
|
||||
}
|
||||
|
||||
@@ -1,5 +1,12 @@
|
||||
{ python3Packages, fetchFromGitHub, lib, yubikey-personalization, libu2f-host, libusb1, procps }:
|
||||
|
||||
{
|
||||
python3Packages,
|
||||
fetchFromGitHub,
|
||||
lib,
|
||||
yubikey-personalization,
|
||||
libu2f-host,
|
||||
libusb1,
|
||||
procps,
|
||||
}:
|
||||
python3Packages.buildPythonPackage rec {
|
||||
pname = "yubikey-manager";
|
||||
version = "4.0.8";
|
||||
@@ -12,7 +19,7 @@ python3Packages.buildPythonPackage rec {
|
||||
sha256 = "sha256-OszXOu/NhoX4WutsT4Z1LsY54KTOWRKt13yDo2fzDbA=";
|
||||
};
|
||||
|
||||
patches = [ ./lol.patch ];
|
||||
patches = [./lol.patch];
|
||||
doCheck = false;
|
||||
|
||||
postPatch = ''
|
||||
@@ -22,25 +29,28 @@ python3Packages.buildPythonPackage rec {
|
||||
--replace 'pkill' '${procps}/bin/pkill'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = with python3Packages; [ poetry-core ];
|
||||
nativeBuildInputs = with python3Packages; [poetry-core];
|
||||
|
||||
propagatedBuildInputs =
|
||||
with python3Packages; [
|
||||
propagatedBuildInputs = with python3Packages;
|
||||
[
|
||||
click
|
||||
cryptography
|
||||
pyscard
|
||||
pyusb
|
||||
six
|
||||
fido2
|
||||
] ++ [
|
||||
]
|
||||
++ [
|
||||
libu2f-host
|
||||
libusb1
|
||||
yubikey-personalization
|
||||
];
|
||||
|
||||
makeWrapperArgs = [
|
||||
"--prefix" "LD_LIBRARY_PATH" ":"
|
||||
(lib.makeLibraryPath [ libu2f-host libusb1 yubikey-personalization ])
|
||||
"--prefix"
|
||||
"LD_LIBRARY_PATH"
|
||||
":"
|
||||
(lib.makeLibraryPath [libu2f-host libusb1 yubikey-personalization])
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
@@ -55,7 +65,7 @@ python3Packages.buildPythonPackage rec {
|
||||
--replace 'compdef _ykman_completion ykman;' '_ykman_completion "$@"'
|
||||
'';
|
||||
|
||||
checkInputs = with python3Packages; [ pytestCheckHook makefun ];
|
||||
checkInputs = with python3Packages; [pytestCheckHook makefun];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://developers.yubico.com/yubikey-manager";
|
||||
@@ -63,6 +73,6 @@ python3Packages.buildPythonPackage rec {
|
||||
|
||||
license = licenses.bsd2;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ benley lassulus pinpox ];
|
||||
maintainers = with maintainers; [benley lassulus pinpox];
|
||||
};
|
||||
}
|
||||
|
||||
+46
-38
@@ -1,35 +1,35 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, imagemagickBig
|
||||
, pkg-config
|
||||
, libX11
|
||||
, libv4l
|
||||
, libiconv
|
||||
, qtbase ? null
|
||||
, darwin
|
||||
, qtx11extras ? null
|
||||
, wrapQtAppsHook ? null
|
||||
, wrapGAppsHook
|
||||
, gtk3
|
||||
, xmlto
|
||||
, docbook_xsl
|
||||
, autoreconfHook
|
||||
, dbus
|
||||
, enableVideo ? stdenv.isLinux
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
imagemagickBig,
|
||||
pkg-config,
|
||||
libX11,
|
||||
libv4l,
|
||||
libiconv,
|
||||
qtbase ? null,
|
||||
darwin,
|
||||
qtx11extras ? null,
|
||||
wrapQtAppsHook ? null,
|
||||
wrapGAppsHook,
|
||||
gtk3,
|
||||
xmlto,
|
||||
docbook_xsl,
|
||||
autoreconfHook,
|
||||
dbus,
|
||||
enableVideo ? stdenv.isLinux,
|
||||
# The implementation is buggy and produces an error like
|
||||
# Name Error (Connection ":1.4380" is not allowed to own the service "org.linuxtv.Zbar" due to security policies in the configuration file)
|
||||
# for every scanned code.
|
||||
# see https://github.com/mchehab/zbar/issues/104
|
||||
, enableDbus ? false
|
||||
, libintl
|
||||
enableDbus ? false,
|
||||
libintl,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "zbar";
|
||||
version = "0.23.90";
|
||||
|
||||
outputs = [ "out" "lib" "dev" "doc" "man" ];
|
||||
outputs = ["out" "lib" "dev" "doc" "man"];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mchehab";
|
||||
@@ -39,25 +39,33 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
nativeBuildInputs =
|
||||
[ pkg-config xmlto autoreconfHook docbook_xsl ] ++ lib.optionals enableVideo [ wrapQtAppsHook wrapGAppsHook ];
|
||||
[pkg-config xmlto autoreconfHook docbook_xsl] ++ lib.optionals enableVideo [wrapQtAppsHook wrapGAppsHook];
|
||||
|
||||
buildInputs = [ imagemagickBig libX11 libintl ] ++ lib.optionals enableDbus [ dbus ]
|
||||
++ lib.optionals enableVideo [ libv4l gtk3 qtbase qtx11extras ]
|
||||
++ lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Foundation ];
|
||||
buildInputs =
|
||||
[imagemagickBig libX11 libintl]
|
||||
++ lib.optionals enableDbus [dbus]
|
||||
++ lib.optionals enableVideo [libv4l gtk3 qtbase qtx11extras]
|
||||
++ lib.optionals stdenv.isDarwin [libiconv darwin.apple_sdk.frameworks.Foundation];
|
||||
|
||||
# Disable assertions which include -dev QtBase file paths.
|
||||
NIX_CFLAGS_COMPILE = "-DQT_NO_DEBUG";
|
||||
|
||||
configureFlags = [ "--without-python" ] ++ (if enableDbus then
|
||||
[ "--with-dbusconfdir=${placeholder "out"}/share" ]
|
||||
else
|
||||
[ "--without-dbus" ]) ++ (if enableVideo then
|
||||
[ "--with-gtk=gtk3" ]
|
||||
else [
|
||||
"--disable-video"
|
||||
"--without-gtk"
|
||||
"--without-qt"
|
||||
]);
|
||||
configureFlags =
|
||||
["--without-python"]
|
||||
++ (
|
||||
if enableDbus
|
||||
then ["--with-dbusconfdir=${placeholder "out"}/share"]
|
||||
else ["--without-dbus"]
|
||||
)
|
||||
++ (
|
||||
if enableVideo
|
||||
then ["--with-gtk=gtk3"]
|
||||
else [
|
||||
"--disable-video"
|
||||
"--without-gtk"
|
||||
"--without-qt"
|
||||
]
|
||||
);
|
||||
|
||||
dontWrapQtApps = true;
|
||||
dontWrapGApps = true;
|
||||
@@ -78,7 +86,7 @@ stdenv.mkDerivation rec {
|
||||
EAN-13/UPC-A, UPC-E, EAN-8, Code 128, Code 39, Interleaved 2 of 5 and QR
|
||||
Code.
|
||||
'';
|
||||
maintainers = with maintainers; [ delroth raskin ];
|
||||
maintainers = with maintainers; [delroth raskin];
|
||||
platforms = platforms.unix;
|
||||
license = licenses.lgpl21;
|
||||
homepage = "https://github.com/mchehab/zbar";
|
||||
|
||||
Reference in New Issue
Block a user