From df04918245d3a0e630374d9eca162b844c18da5d Mon Sep 17 00:00:00 2001 From: Carsten Kragelund Date: Sat, 20 May 2023 02:07:58 +0200 Subject: [PATCH] overwrite gitea version and tags manually --- default.nix | 2 +- pkgs/gitea-nyx/default.nix | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/default.nix b/default.nix index 81bdf96..1ca54e5 100644 --- a/default.nix +++ b/default.nix @@ -17,7 +17,7 @@ overlays = import ./overlays; # nixpkgs overlays firefox-addons = pkgs.recurseIntoAttrs (pkgs.callPackage ./pkgs/firefox-addons { }); - gitea-nyx = import ./pkgs/gitea-nyx { inherit pkgs; }; + gitea-nyx = pkgs.callPackage ./pkgs/gitea-nyx { }; emacsPackages = pkgs.recurseIntoAttrs (pkgs.callPackage ./pkgs/emacs-packages { }); pythonPackages = pkgs.recurseIntoAttrs (pkgs.callPackage ./pkgs/python-packages { }); rec-mono-nyx = pkgs.callPackage ./pkgs/rec-mono-nyx { inherit system; }; diff --git a/pkgs/gitea-nyx/default.nix b/pkgs/gitea-nyx/default.nix index f2e1069..f51ace5 100644 --- a/pkgs/gitea-nyx/default.nix +++ b/pkgs/gitea-nyx/default.nix @@ -1,6 +1,13 @@ -{ pkgs, ... }: pkgs.gitea.overrideAttrs (old: rec { +{ pkgs, lib, ... }: pkgs.gitea.overrideAttrs (old: rec { pname = "gitea"; version = "v1.20.0-dev"; src = "${import ./build.nix { inherit pkgs; giteaVersion = version; }}/gitea-src-${version}-nyx.tar.gz"; + + ldflags = [ + "-s" + "-w" + "-X main.Version=${version}-nyx" + "-X 'main.Tags=${lib.concatStringsSep " " old.tags}'" + ]; })