Revert "Rebuild cyrus-sasl with XOAUTH2 support"
This reverts commit dea7abd19a
.
This commit is contained in:
parent
f92f547fd1
commit
e10ef1c20d
|
@ -111,7 +111,6 @@ with pkgs;
|
|||
./modules/cachix.nix
|
||||
./overlays/emacs.nix
|
||||
./overlays/nix-direnv.nix
|
||||
./overlays/cyrus-sasl.nix
|
||||
];
|
||||
|
||||
}
|
||||
|
|
17
flake.lock
17
flake.lock
|
@ -20,22 +20,6 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"cyrus-sasl-xoauth2": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1611713742,
|
||||
"narHash": "sha256-IaH8tNUhM0lUOmFiG4G9cGzsuM9mTWfQrzoQ78MIgZ0=",
|
||||
"owner": "robn",
|
||||
"repo": "sasl2-oauth",
|
||||
"rev": "4236b6fb904d836b85b55ba32128b843fd8c2362",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "robn",
|
||||
"repo": "sasl2-oauth",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"emacs-overlay": {
|
||||
"locked": {
|
||||
"lastModified": 1635818927,
|
||||
|
@ -69,7 +53,6 @@
|
|||
"root": {
|
||||
"inputs": {
|
||||
"agenix": "agenix",
|
||||
"cyrus-sasl-xoauth2": "cyrus-sasl-xoauth2",
|
||||
"emacs-overlay": "emacs-overlay",
|
||||
"nixpkgs": "nixpkgs"
|
||||
}
|
||||
|
|
|
@ -6,10 +6,6 @@
|
|||
agenix.url = "github:ryantm/agenix";
|
||||
agenix.inputs.nixpkgs.follows = "nixpkgs";
|
||||
emacs-overlay.url = "github:nix-community/emacs-overlay";
|
||||
cyrus-sasl-xoauth2 = {
|
||||
url = "github:robn/sasl2-oauth";
|
||||
flake = false;
|
||||
};
|
||||
};
|
||||
|
||||
outputs = { self, nixpkgs, agenix, ... }@inputs:
|
||||
|
|
|
@ -1,24 +0,0 @@
|
|||
{ config, lib, pkgs, inputs, ... }:
|
||||
|
||||
let
|
||||
cyrus-sasl-xoauth2 = with pkgs;
|
||||
stdenv.mkDerivation {
|
||||
name = "cyrus-sasl-xoauth2";
|
||||
src = inputs.cyrus-sasl-xoauth2;
|
||||
nativeBuildInputs =
|
||||
[ autoreconfHook inputs.nixpkgs.legacyPackages."${system}".cyrus_sasl ];
|
||||
};
|
||||
|
||||
in {
|
||||
nixpkgs.overlays = [
|
||||
(final: prev: {
|
||||
cyrus_sasl = prev.cyrus_sasl.overrideAttrs (div: rec {
|
||||
postInstall = ''
|
||||
for lib in ${cyrus-sasl-xoauth2}/lib/sasl2/*; do
|
||||
ln -sf $lib $out/lib/sasl2/
|
||||
done
|
||||
'';
|
||||
});
|
||||
})
|
||||
];
|
||||
}
|
Loading…
Reference in New Issue