From bd45b922601eeb7b5d15f9e51ed7e855a690a281 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= Date: Fri, 28 Oct 2022 09:57:50 +0200 Subject: Revert "pkgs: add cyrus-sasl-xoauth2" This reverts commit a5b7a8482adb4d8bd829a9a6e50819c2784185b0. Just use it in Ferdium. OAuth2 on MS is stupid. --- pkgs/cyrus-sasl-xoauth2/default.nix | 31 ------------------------------- pkgs/default.nix | 12 ------------ 2 files changed, 43 deletions(-) delete mode 100644 pkgs/cyrus-sasl-xoauth2/default.nix diff --git a/pkgs/cyrus-sasl-xoauth2/default.nix b/pkgs/cyrus-sasl-xoauth2/default.nix deleted file mode 100644 index 2bd8713..0000000 --- a/pkgs/cyrus-sasl-xoauth2/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib, stdenv, fetchFromGitHub -, autoconf, automake, libtool, pkg-config -, cyrus_sasl -}: - -with lib; - -stdenv.mkDerivation rec { - pname = "cyrus-sasl-xoauth2"; - version = "0.2"; - src = fetchFromGitHub { - owner = "moriyoshi"; - repo = "cyrus-sasl-xoauth2"; - rev = "v${version}"; - sha256 = "lI8uKtVxrziQ8q/Ss+QTgg1xTObZUTAzjL3MYmtwyd8="; - }; - - nativeBuildInputs = [ - autoconf automake libtool pkg-config - ]; - buildInputs = [ - cyrus_sasl - ]; - - preConfigure = '' - ./autogen.sh - ''; - installPhase = '' - make DESTDIR=$out install - ''; -} diff --git a/pkgs/default.nix b/pkgs/default.nix index 2486095..7c1350b 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -31,18 +31,6 @@ let ]; }; - # cyrus_sasl with curus_sasl_xoauth2 - cyrus_sasl_xoauth2 = callPackage ./cyrus-sasl-xoauth2 { - cyrus_sasl = nixpkgs.cyrus_sasl; # prevent infinite cycle - }; - cyrus_sasl = nixpkgs.cyrus_sasl.overrideAttrs (div: rec { - postInstall = '' - for lib in ${cyrus_sasl_xoauth2}/usr/lib/sasl2/*; do - ln -sf $lib $out/lib/sasl2/ - done - ''; - }); - }; in personalpkgs -- cgit v1.2.3