flare-signal-nixified: simplify
This commit is contained in:
@@ -50,54 +50,6 @@ let
|
|||||||
repo = "flare";
|
repo = "flare";
|
||||||
rev = "0.15.0";
|
rev = "0.15.0";
|
||||||
hash = "sha256-sIT4oEmIV8TJ5MMxg3vxkvK+7PaIy/01kN9I2FTsfo0=";
|
hash = "sha256-sIT4oEmIV8TJ5MMxg3vxkvK+7PaIy/01kN9I2FTsfo0=";
|
||||||
|
|
||||||
# flare/Cargo.nix version compatibility:
|
|
||||||
# - flare 0.10.1-beta.6: compiles
|
|
||||||
# - flare 0.10.1-beta.5: can't crate2nix because Cargo.lock is out of date with Cargo.toml
|
|
||||||
# - flare 0.10.1-beta.4: compiles
|
|
||||||
# - flare 0.10.1-beta.2: requires gtk 4.11, not yet in nixpkgs
|
|
||||||
# - <https://github.com/NixOS/nixpkgs/pull/247766>
|
|
||||||
# - specifically, that's because of gdk4-sys 0.7.2.
|
|
||||||
# - after 0.10.1-beta.1, there's a translations update, then immediately "ui(): Port to GTK 4.12 and Libadwaita 1.4"
|
|
||||||
# so 0.10.1-beta.1 is effectively the last gtk 4.10 compatible version
|
|
||||||
# - flare 0.10.1-beta.1: uses a variant of serde_derive which doesn't cross compile in nixpkgs
|
|
||||||
# - after serde_derive downgraded => 1.0.171:
|
|
||||||
# ```
|
|
||||||
# > 424 | .send(manager.sync_contacts().await)
|
|
||||||
# > | ^^^^^^^^^^^^^ private method
|
|
||||||
# > --> /presage-d6d8fff/presage/src/manager.rs:650:5
|
|
||||||
# > = note: private method defined here
|
|
||||||
|
|
||||||
# ```
|
|
||||||
# - flare 0.10.0: uses a version of serde_derive which doesn't cross compile in nixpkgs
|
|
||||||
# - same error as 0.9.0 once serde_derive is downgraded to 1.0.171
|
|
||||||
# - flare 0.9.3: uses a version of serde_derive which doesn't cross compile in nixpkgs
|
|
||||||
# - same error as 0.9.0 once serde_derive is downgraded to 1.0.171
|
|
||||||
# - flare 0.9.2: uses a version of serde_derive which doesn't cross compile in nixpkgs
|
|
||||||
# - same error as 0.9.0 once serde_derive is downgraded to 1.0.171
|
|
||||||
# - flare 0.9.1: uses a version of serde_derive (1.0.175) which doesn't cross compile in nixpkgs
|
|
||||||
# - flare 16acc70ceb6e80eb2d87a92e72e2727e8b98b4db (last rev before serde_derive 1.0.175): same error as 0.9.0
|
|
||||||
# - flare 0.9.0: deps build but crate itself fails because `mod config` is unknown (i.e. we didn't invoke meson and let it generate config.rs)
|
|
||||||
# rev = "0.10.1-beta.6";
|
|
||||||
# hash = "sha256-NhQu9gpnweI+kIWh3Mbb9bCQnfgthxocAqDRwG0m2Hg=";
|
|
||||||
# rev = "0.10.1-beta.5";
|
|
||||||
# hash = "sha256-AAxasck8rm8N73jcJU6qW+zR3qSAH5nsi4hTunSnW8Y=";
|
|
||||||
# rev = "0.10.1-beta.4";
|
|
||||||
# hash = "sha256-SkHARJ4V8t4dXITH+V36RIfPrWL5Bdju1gahCS2aiWo=";
|
|
||||||
# rev = "0.10.1-beta.2";
|
|
||||||
# hash = "sha256-xkTM8Jeyb89ZUo2lFKNm8HlTe8BTlO/flZmENRfDEm4=";
|
|
||||||
# rev = "0.10.1-beta.1";
|
|
||||||
# hash = "sha256-nUR3jnbjMJvI3XbguFLz5yQL3SAXzLkdVwXyhcMeZoc=";
|
|
||||||
# rev = "0.10.0";
|
|
||||||
# hash = "sha256-+9zpYW9xjLe78c2GRL6raFDR5g+R/JWxQzU/ZS+5JtY=";
|
|
||||||
# rev = "0.9.3";
|
|
||||||
# hash = "sha256-bTR3Jzzy8dVdBJ4Mo2PYstEnNzBVwiWE8hRBnJ7pJSs=";
|
|
||||||
# rev = "0.9.2";
|
|
||||||
# hash = "sha256-70OqHCe+NZ0dn1sjpkke5MtXU3bFgpwkm0TYlbXOUl8=";
|
|
||||||
# rev = "16acc70ceb6e80eb2d87a92e72e2727e8b98b4db";
|
|
||||||
# hash = "sha256-Lz7h5JUrqBUsvRICW3QacuO8rkeGBY9yroq/Gtb7nMw=";
|
|
||||||
# rev = "0.9.0";
|
|
||||||
# hash = "sha256-6p9uuK71fJvJs0U14jJEVb2mfpZWrCZZFE3eoZe9eVo=";
|
|
||||||
};
|
};
|
||||||
|
|
||||||
codegenUnits = 16; # speeds up the build a bit
|
codegenUnits = 16; # speeds up the build a bit
|
||||||
@@ -108,7 +60,6 @@ let
|
|||||||
appstream-glib # for appstream-util
|
appstream-glib # for appstream-util
|
||||||
blueprint-compiler
|
blueprint-compiler
|
||||||
desktop-file-utils # for update-desktop-database
|
desktop-file-utils # for update-desktop-database
|
||||||
gobject-introspection
|
|
||||||
meson
|
meson
|
||||||
ninja
|
ninja
|
||||||
pkg-config
|
pkg-config
|
||||||
@@ -118,11 +69,10 @@ let
|
|||||||
buildInputs = [
|
buildInputs = [
|
||||||
gtksourceview5
|
gtksourceview5
|
||||||
libadwaita
|
libadwaita
|
||||||
libsecret
|
# libsecret
|
||||||
# libspelling # optional feature. to enable, add it to `rootFeatures` above too.
|
# libspelling # optional feature. to enable, add it to `rootFeatures` above too.
|
||||||
protobuf
|
|
||||||
|
|
||||||
# To reproduce audio messages
|
# To reproduce audio messages (c/o nixpkgs flare-signal)
|
||||||
gst_all_1.gstreamer
|
gst_all_1.gstreamer
|
||||||
gst_all_1.gst-plugins-base
|
gst_all_1.gst-plugins-base
|
||||||
gst_all_1.gst-plugins-good
|
gst_all_1.gst-plugins-good
|
||||||
@@ -215,10 +165,6 @@ let
|
|||||||
installPhase = "ninjaInstallPhase";
|
installPhase = "ninjaInstallPhase";
|
||||||
};
|
};
|
||||||
|
|
||||||
gdk-pixbuf-sys = attrs: attrs // {
|
|
||||||
nativeBuildInputs = [ pkg-config ];
|
|
||||||
buildInputs = [ gdk-pixbuf ];
|
|
||||||
};
|
|
||||||
gdk4-wayland-sys = attrs: attrs // {
|
gdk4-wayland-sys = attrs: attrs // {
|
||||||
nativeBuildInputs = [ pkg-config ];
|
nativeBuildInputs = [ pkg-config ];
|
||||||
buildInputs = [ gtk4 ]; # depends on "gtk4_wayland"
|
buildInputs = [ gtk4 ]; # depends on "gtk4_wayland"
|
||||||
@@ -227,14 +173,6 @@ let
|
|||||||
nativeBuildInputs = [ pkg-config ];
|
nativeBuildInputs = [ pkg-config ];
|
||||||
buildInputs = [ gtk4 ]; # depends on "gtk4_x11"
|
buildInputs = [ gtk4 ]; # depends on "gtk4_x11"
|
||||||
};
|
};
|
||||||
gio-sys = attrs: attrs // {
|
|
||||||
nativeBuildInputs = [ pkg-config ];
|
|
||||||
buildInputs = [ glib ];
|
|
||||||
};
|
|
||||||
gobject-sys = attrs: attrs // {
|
|
||||||
nativeBuildInputs = [ pkg-config ];
|
|
||||||
buildInputs = [ glib ];
|
|
||||||
};
|
|
||||||
libadwaita-sys = attrs: attrs // {
|
libadwaita-sys = attrs: attrs // {
|
||||||
nativeBuildInputs = [ pkg-config ];
|
nativeBuildInputs = [ pkg-config ];
|
||||||
buildInputs = [ libadwaita ];
|
buildInputs = [ libadwaita ];
|
||||||
|
Reference in New Issue
Block a user