balsoft/nixos-config
1
0
Fork 0
Code Issues Releases Wiki Activity

Revert "Update nheko"

Browse Source 
This reverts commit 0c364c74c4.
This commit is contained in:
Alexander Bantyev 2021-09-21 15:01:31 +03:00
parent babaa466fa
commit 66579afa14
Signed by: balsoft
GPG Key ID: E081FF12ADCB4AD5
4 changed files with 8 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
flake.lock
View File

@ -32,22 +32,6 @@
"type": "github" "type": "github"
} }
}, },
"coeurl": {
"flake": false,
"locked": {
"lastModified": 1628872501,
"narHash": "sha256-bslkrBjAsf2co4lt9efEQ3R6YNR2+minZAKkcZKjykI=",
"ref": "master",
"rev": "22f58922da16c3b94d293d98a07cb7caa7a019e8",
"revCount": 51,
"type": "git",
"url": "https://nheko.im/nheko-reborn/coeurl"
},
"original": {
"type": "git",
"url": "https://nheko.im/nheko-reborn/coeurl"
}
},
"crate2nix": { "crate2nix": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -353,11 +337,11 @@
"mtxclient": { "mtxclient": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1630632658, "lastModified": 1624110239,
"narHash": "sha256-onpaWKkTgwQkIZrou7VmhlLRq5dIu1yZ8R/pc00KCkc=", "narHash": "sha256-JlTGwFZKQ0sJpOPtMPKY9wm11yDrdyNw9OKr7E4yBOQ=",
"owner": "nheko-reborn", "owner": "nheko-reborn",
"repo": "mtxclient", "repo": "mtxclient",
"rev": "a4f4c79153cc139c44aaf7bd5bf47fef6c0712b3", "rev": "acfff15ca153723e41cf7ef06ff82b1c24c933ef",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -391,11 +375,11 @@
"nheko": { "nheko": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1631536282, "lastModified": 1624613955,
"narHash": "sha256-kavv/Aw38skTuL6AlhgE5pdDm/8RWl3I+sheTJFQD3A=", "narHash": "sha256-/k/081pI0S8YHxbct1yhNqJQW4EKfu9/KsjLZ2CoQDU=",
"owner": "nheko-reborn", "owner": "nheko-reborn",
"repo": "nheko", "repo": "nheko",
"rev": "1b82b8242b1290b3ce39f932597e8cd3854b5e82", "rev": "36f0e044398535143f24bbf2850df9e5b2947770",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -646,7 +630,6 @@
"inputs": { "inputs": {
"NUR": "NUR", "NUR": "NUR",
"base16-black-metal-scheme": "base16-black-metal-scheme", "base16-black-metal-scheme": "base16-black-metal-scheme",
"coeurl": "coeurl",
"crdt": "crdt", "crdt": "crdt",
"deploy-rs": "deploy-rs", "deploy-rs": "deploy-rs",
"emacs-overlay": "emacs-overlay", "emacs-overlay": "emacs-overlay",

5
flake.nix
View File

@ -73,11 +73,6 @@
flake = false; flake = false;
}; };
coeurl = {
url = "git+https://nheko.im/nheko-reborn/coeurl";
flake = false;
};
mopidy-ytmusic = { mopidy-ytmusic = {
url = "github:OzymandiasTheGreat/mopidy-ytmusic"; url = "github:OzymandiasTheGreat/mopidy-ytmusic";
flake = false; flake = false;

2
machines/AMD-Workstation/default.nix
View File

@ -40,7 +40,7 @@
enable = true; enable = true;
proxy = true; proxy = true;
lanSize = 32; lanSize = 32;
serverIP = "95.217.152.163"; serverIP = "147.75.100.17";
serverPort = 35944; serverPort = 35944;
serverKey = "sgLUARawWJejANs2CwuCptwJO55c4jkmnP0L14FNCyw="; serverKey = "sgLUARawWJejANs2CwuCptwJO55c4jkmnP0L14FNCyw=";
privateKeyFile = config.secrets.wireguard-wg0.decrypted; privateKeyFile = config.secrets.wireguard-wg0.decrypted;

24
profiles/overlay.nix
View File

@ -142,34 +142,12 @@ in {
nix-direnv = inputs.nix-direnv.defaultPackage.${system}; nix-direnv = inputs.nix-direnv.defaultPackage.${system};
coeurl = self.stdenv.mkDerivation { mtxclient = super.mtxclient.overrideAttrs (_: {
name = "coeurl";
src = inputs.coeurl;
buildInputs = [ self.curl.all self.libevent self.spdlog ];
nativeBuildInputs = [ self.meson self.ninja self.pkg-config self.cmake ];
};
mtxclient = super.mtxclient.overrideAttrs (oa: {
src = inputs.mtxclient; src = inputs.mtxclient;
cmakeFlags = oa.cmakeFlags ++ [ "-DCMAKE_CXX_FLAGS=-DSPDLOG_FMT_EXTERNAL" ];
buildInputs = oa.buildInputs ++ [ self.libevent self.curl.all self.coeurl self.spdlog.dev ];
}); });
nheko = (super.nheko.overrideAttrs (oa: { nheko = (super.nheko.overrideAttrs (oa: {
src = inputs.nheko; src = inputs.nheko;
postPatch = ''
substituteInPlace CMakeLists.txt --replace "# Fixup bundled keychain include dirs" "find_package(Boost COMPONENTS iostreams system thread REQUIRED)"
'';
buildInputs = oa.buildInputs ++ [
self.xorg.libXdmcp
self.pcre
self.libunwind
self.elfutils
self.coeurl
self.curl
self.libevent
];
cmakeFlags = oa.cmakeFlags ++ [ "-DBUILD_SHARED_LIBS=OFF" ];
})).override { mtxclient = self.mtxclient; }; })).override { mtxclient = self.mtxclient; };
}) })
]; ];