dusk/ark
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

hm yes

Browse Source
This commit is contained in:
dusk 2022-07-17 20:31:05 +03:00
parent 5b0107275c
commit 93a99aa202
Signed by: dusk
GPG Key ID: 1D8F8FAF2294D6EA
7 changed files with 166 additions and 126 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

122
pkgs-set/overlays/fractal-next.nix
View File

@ -1,122 +0,0 @@
let
fractal-next = {
lib,
stdenv,
fetchFromGitLab,
nix-update-script,
meson,
cmake,
ninja,
gettext,
python3,
rustPlatform,
pkg-config,
glib,
libhandy,
libsecret,
libshumate,
gtk4,
gtksourceview5,
libadwaita,
llvmPackages,
glibc,
wayland,
pipewire,
dbus,
openssl,
sqlite,
gst_all_1,
cairo,
gdk-pixbuf,
gspell,
wrapGAppsHook,
desktop-file-utils,
appstream-glib,
}:
stdenv.mkDerivation rec {
pname = "fractal-next";
version = "1206d4ed12059a298b5d918fd0a77dca034f7084";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "GNOME";
repo = "fractal";
rev = "1206d4ed12059a298b5d918fd0a77dca034f7084";
sha256 = "sha256-ioMgVj85BKvsIjBbTAHFN6k5B/H86GLMTgAXK/5ji/k=";
};
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src;
name = "${pname}-${version}";
hash = "sha256-gbTljLIYAanXm1D/tNBGNMlaDatXgZDeSY5pA8s5gog=";
};
nativeBuildInputs = [
appstream-glib # for appstream-util
gettext
meson
ninja
pkg-config
python3
rustPlatform.rust.cargo
rustPlatform.cargoSetupHook
rustPlatform.rust.rustc
wrapGAppsHook
desktop-file-utils
glib
cmake
];
buildInputs = [
cairo
dbus
gdk-pixbuf
glib
gspell
gst_all_1.gst-editing-services
gst_all_1.gst-plugins-bad
gst_all_1.gst-plugins-base
(gst_all_1.gst-plugins-good.override {
gtkSupport = true;
})
gst_all_1.gstreamer
gst_all_1.gst-devtools
gtk4
gtksourceview5
libadwaita
wayland
pipewire
libhandy
openssl
libsecret
libshumate
];
# libspa-sys requires this for bindgen
LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib";
# <spa-0.2/spa/utils/defs.h> included by libspa-sys requires <stdbool.h>
BINDGEN_EXTRA_CLANG_ARGS = "-I${llvmPackages.libclang.lib}/lib/clang/${lib.getVersion llvmPackages.clang}/include -I${glibc.dev}/include";
doCheck = false;
postPatch = ''
patchShebangs build-aux/meson_post_install.py
'';
passthru = {
updateScript = nix-update-script {
attrPath = pname;
};
};
meta = with lib; {
description = "Matrix group messaging app";
homepage = "https://gitlab.gnome.org/GNOME/fractal";
license = licenses.gpl3;
maintainers = teams.gnome.members ++ (with maintainers; [dtzWill genofire]);
};
};
in
_: prev: {
fractal-next = prev.callPackage fractal-next {};
}

1
pkgs-set/pkgs-to-export.nix
View File

@ -5,6 +5,7 @@ pkgs: (
"fractal-next"
"gamescope"
"gaudible"
"abaddon"
]
pkgs
)

42
pkgs-set/pkgs/abaddon.nix Normal file
View File

@ -0,0 +1,42 @@
{
stdenv,
fetchFromGitHub,
gtkmm3,
sqlite,
openssl,
curlWithGnuTls,
nlohmann_json,
pkg-config,
cmake,
...
}:
stdenv.mkDerivation rec {
pname = "abaddon";
version = "ccf5afbba959068f34897b75afcd25c65c96d79c";
src = fetchFromGitHub {
owner = "uowuo";
repo = pname;
rev = version;
sha256 = "sha256-PKEly2yBM6UKNi/XEEUvbpTmvNSNJM1lUVMovCHgi50=";
fetchSubmodules = true;
};
nativeBuildInputs = [
pkg-config
cmake
];
buildInputs = [
gtkmm3.dev
curlWithGnuTls.dev
sqlite.dev
openssl
nlohmann_json
];
configurePhase = "mkdir build && cd build && cmake ..";
installPhase = "mkdir -p $out/bin && mv abaddon $out/bin/abaddon";
doCheck = false;
}

118
pkgs-set/pkgs/fractal-next.nix Normal file
View File

@ -0,0 +1,118 @@
{
lib,
stdenv,
fetchFromGitLab,
nix-update-script,
meson,
cmake,
ninja,
gettext,
python3,
rustPlatform,
pkg-config,
glib,
libhandy,
libsecret,
libshumate,
gtk4,
gtksourceview5,
libadwaita,
llvmPackages,
glibc,
wayland,
pipewire,
dbus,
openssl,
sqlite,
gst_all_1,
cairo,
gdk-pixbuf,
gspell,
wrapGAppsHook,
desktop-file-utils,
appstream-glib,
...
}:
stdenv.mkDerivation rec {
pname = "fractal-next";
version = "1206d4ed12059a298b5d918fd0a77dca034f7084";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "GNOME";
repo = "fractal";
rev = "1206d4ed12059a298b5d918fd0a77dca034f7084";
sha256 = "sha256-ioMgVj85BKvsIjBbTAHFN6k5B/H86GLMTgAXK/5ji/k=";
};
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src;
name = "${pname}-${version}";
hash = "sha256-gbTljLIYAanXm1D/tNBGNMlaDatXgZDeSY5pA8s5gog=";
};
nativeBuildInputs = [
appstream-glib # for appstream-util
gettext
meson
ninja
pkg-config
python3
rustPlatform.rust.cargo
rustPlatform.cargoSetupHook
rustPlatform.rust.rustc
wrapGAppsHook
desktop-file-utils
glib
cmake
];
buildInputs = [
cairo
dbus
gdk-pixbuf
glib
gspell
gst_all_1.gst-editing-services
gst_all_1.gst-plugins-bad
gst_all_1.gst-plugins-base
(gst_all_1.gst-plugins-good.override {
gtkSupport = true;
})
gst_all_1.gstreamer
gst_all_1.gst-devtools
gtk4
gtksourceview5
libadwaita
wayland
pipewire
libhandy
openssl
libsecret
libshumate
];
# libspa-sys requires this for bindgen
LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib";
# <spa-0.2/spa/utils/defs.h> included by libspa-sys requires <stdbool.h>
BINDGEN_EXTRA_CLANG_ARGS = "-I${llvmPackages.libclang.lib}/lib/clang/${lib.getVersion llvmPackages.clang}/include -I${glibc.dev}/include";
doCheck = false;
postPatch = ''
patchShebangs build-aux/meson_post_install.py
'';
passthru = {
updateScript = nix-update-script {
attrPath = pname;
};
};
meta = with lib; {
description = "Matrix group messaging app";
homepage = "https://gitlab.gnome.org/GNOME/fractal";
license = licenses.gpl3;
maintainers = teams.gnome.members ++ (with maintainers; [dtzWill genofire]);
};
}

2
users/modules/starship/default.nix
View File

@ -2,7 +2,7 @@
programs.starship = {
enable = true;
settings = {
format = "$shell$shlvl$nix_shell@ $directory$character";
format = "$shell$shlvl@ $directory$character";
add_newline = false;
character = {
success_symbol = "[>](bold green)";

1
users/patriot/default.nix
View File

@ -254,6 +254,7 @@ in {
bindkey "$terminfo[kLFT5]" backward-word
# makes completions pog
zstyle ':completion:*' menu select
${pkgBin "any-nix-shell"} zsh --info-right | source /dev/stdin
'';
loginExtra = ''
if [[ "$(tty)" == "/dev/tty1" ]]; then