feat(firefox): improve versioning for gx
All checks were successful
Discord / discord commits (push) Has been skipped
All checks were successful
Discord / discord commits (push) Has been skipped
This commit is contained in:
parent
8c32a7372b
commit
ebade29341
5 changed files with 33 additions and 23 deletions
BIN
flake.lock
BIN
flake.lock
Binary file not shown.
BIN
flake.nix
BIN
flake.nix
Binary file not shown.
|
@ -8,8 +8,7 @@ self: {
|
||||||
rounding = (config.wayland.windowManager.hyprland.settings.decoration.rounding or 2) - 2;
|
rounding = (config.wayland.windowManager.hyprland.settings.decoration.rounding or 2) - 2;
|
||||||
|
|
||||||
firefox-gx = pkgs.callPackage ./gx-theme.nix {
|
firefox-gx = pkgs.callPackage ./gx-theme.nix {
|
||||||
inherit (self.inputs) firefox-gx-src;
|
inherit self;
|
||||||
inherit (self.lib) mkVersion;
|
|
||||||
};
|
};
|
||||||
in {
|
in {
|
||||||
config = {
|
config = {
|
||||||
|
|
|
@ -1,12 +1,23 @@
|
||||||
{
|
{
|
||||||
lib,
|
lib,
|
||||||
mkVersion,
|
self,
|
||||||
firefox-gx-src,
|
|
||||||
stdenvNoCC,
|
stdenvNoCC,
|
||||||
}:
|
}: let
|
||||||
stdenvNoCC.mkDerivation {
|
inherit (builtins) fromJSON readFile;
|
||||||
|
inherit (lib) hasPrefix replaceStrings;
|
||||||
|
|
||||||
|
inherit (self.inputs) firefox-gx-src;
|
||||||
|
inherit (self.lib) mkVersion;
|
||||||
|
|
||||||
|
lock = fromJSON (readFile ../flake.lock);
|
||||||
|
rev = lock.nodes.firefox-gx-src.original.ref;
|
||||||
|
in
|
||||||
|
stdenvNoCC.mkDerivation {
|
||||||
pname = "firefox-gx";
|
pname = "firefox-gx";
|
||||||
version = mkVersion firefox-gx-src;
|
version =
|
||||||
|
if hasPrefix "v." rev
|
||||||
|
then replaceStrings ["v"] ["0"] rev
|
||||||
|
else mkVersion firefox-gx-src;
|
||||||
|
|
||||||
src = firefox-gx-src;
|
src = firefox-gx-src;
|
||||||
|
|
||||||
|
@ -24,4 +35,4 @@ stdenvNoCC.mkDerivation {
|
||||||
homepage = "https://github.com/Godiesc/firefox-gx";
|
homepage = "https://github.com/Godiesc/firefox-gx";
|
||||||
license = lib.licenses.mspl;
|
license = lib.licenses.mspl;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -344,7 +344,7 @@ let
|
||||||
{
|
{
|
||||||
owner = "Godiesc";
|
owner = "Godiesc";
|
||||||
repo = "firefox-gx";
|
repo = "firefox-gx";
|
||||||
# ref = "v.9.6";
|
ref = "v.9.7";
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
name = "git-theme-src";
|
name = "git-theme-src";
|
||||||
|
|
Loading…
Reference in a new issue