mirror of
https://github.com/Gerg-L/nixos.git
synced 2025-12-10 00:43:56 -05:00
parrot and qemu PR's merged
This commit is contained in:
parent
ec79c9b582
commit
af43d70734
3 changed files with 2 additions and 49 deletions
|
|
@ -1,4 +1,4 @@
|
|||
{self, ...}: {
|
||||
_: {
|
||||
pkgs,
|
||||
config,
|
||||
lib,
|
||||
|
|
@ -10,7 +10,7 @@
|
|||
wantedBy = ["multi-user.target"];
|
||||
wants = ["network-online.target"];
|
||||
after = ["network-online.target"];
|
||||
script = lib.getExe self.packages.${pkgs.system}.parrot;
|
||||
script = lib.getExe pkgs.parrot;
|
||||
serviceConfig = {
|
||||
EnvironmentFile = config.sops.secrets.discordenv.path;
|
||||
Restart = "on-failure";
|
||||
|
|
|
|||
|
|
@ -88,8 +88,6 @@ in {
|
|||
return;
|
||||
'')
|
||||
];
|
||||
buildInputs = old.buildInputs ++ [pkgs.pipewire];
|
||||
configureFlags = old.configureFlags ++ ["--enable-pipewire"];
|
||||
});
|
||||
runAsRoot = true;
|
||||
ovmf.enable = true;
|
||||
|
|
|
|||
|
|
@ -1,45 +0,0 @@
|
|||
{
|
||||
lib,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
pkg-config,
|
||||
openssl,
|
||||
cmake,
|
||||
libopus,
|
||||
yt-dlp,
|
||||
ffmpeg,
|
||||
makeWrapper,
|
||||
}:
|
||||
rustPlatform.buildRustPackage
|
||||
{
|
||||
pname = "parrot";
|
||||
version = "1.6.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "aquelemiguel";
|
||||
repo = "parrot";
|
||||
rev = "6b1df01bd9cce1c0d8446dea720c4a32ff935514";
|
||||
hash = "sha256-f6YAdsq2ecsOCvk+A8wsUu+ywQnW//gCAkVLF0HTn8c=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-e4NHgwoNkZ0//rugHrP0gU3pntaMeBJsV/YSzJfD8r4=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
cmake
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libopus
|
||||
openssl
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/parrot \
|
||||
--prefix PATH : ${lib.makeBinPath [
|
||||
yt-dlp
|
||||
ffmpeg
|
||||
]}
|
||||
'';
|
||||
meta.mainProgram = "parrot";
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue