Dont try to pass the src into node-env

main
Carsten Kragelund 2023-05-07 20:11:35 +02:00
parent 2825c27f5c
commit f4c2167526
Signed by: nyx
GPG Key ID: CADDADEEC9F753C0
2 changed files with 12 additions and 9 deletions

@ -1,11 +1,6 @@
{ pkgs, giteaVersion, ... }:
let
src = pkgs.fetchgit {
url = "https://gitea.pid1.sh/sanctureplicum/gitea.git";
rev = "refs/tags/${giteaVersion}";
hash = "sha256-KQEBq1BFQRLJW9fJq4W1sOsAqOCfNHKY/+cT8rkXxv4=";
};
nodeNix = (import ./node.nix { inherit pkgs giteaVersion src; });
nodeNix = (import ./node.nix { inherit pkgs giteaVersion; });
nodeEnv = (import (nodeNix + "/default.nix") { });
in
pkgs.buildGoModule rec {
@ -13,7 +8,11 @@ pkgs.buildGoModule rec {
version = "${giteaVersion}-nyx";
vendorSha256 = "sha256-gfHyssQrY5r3rQAzonM3Rv/BDIYGEY/PiOZEyoGGeiw=";
inherit src;
src = pkgs.fetchgit {
url = "https://gitea.pid1.sh/sanctureplicum/gitea.git";
rev = "refs/tags/${giteaVersion}";
hash = "sha256-KQEBq1BFQRLJW9fJq4W1sOsAqOCfNHKY/+cT8rkXxv4=";
};
nativeBuildInputs = [
pkgs.gnumake

@ -1,4 +1,4 @@
{ pkgs, giteaVersion, src, ... }:
{ pkgs, giteaVersion, ... }:
let
escapeSlash = str: builtins.replaceStrings [ "/" ] [ "\\/"] str;
in
@ -6,7 +6,11 @@ pkgs.stdenv.mkDerivation rec {
pname = "gitea-node-env";
version = "${giteaVersion}-nyx";
inherit src;
src = pkgs.fetchgit {
url = "https://gitea.pid1.sh/sanctureplicum/gitea.git";
rev = "refs/tags/${giteaVersion}";
hash = "sha256-KQEBq1BFQRLJW9fJq4W1sOsAqOCfNHKY/+cT8rkXxv4=";
};
nativeBuildInputs = [ pkgs.node2nix ];