Revert approach...

This commit is contained in:
niten 2024-01-27 11:25:11 -08:00
parent 251d405d3a
commit 18ff037bc6
2 changed files with 15 additions and 8 deletions

View File

@ -9,13 +9,20 @@
outputs = { self, gomod2nix, nixpkgs, utils, ... }: outputs = { self, gomod2nix, nixpkgs, utils, ... }:
utils.lib.eachDefaultSystem (system: utils.lib.eachDefaultSystem (system:
let inherit (gomod2nix.legacyPackages."${system}") buildGoApplication; let
pkgs = import nixpkgs {
inherit system;
overlays = [
(final: prev: {
inherit (gomod2nix.legacyPackages."${system}") buildGoApplication;
})
];
};
in { in {
packages = rec { packages = rec {
default = google-photo-uploader; default = google-photo-uploader;
google-photo-uploader = import ./google-photo-uploader.nix { google-photo-uploader =
inherit nixpkgs buildGoApplication; pkgs.callPackage ./google-photo-uploader.nix { };
};
}; };
}); });
} }

View File

@ -1,11 +1,11 @@
{ nixpkgs, buildGoApplication, ... }: { pkgs, lib, ... }:
with nixpkgs.lib; with pkgs.lib;
buildGoApplication rec { buildGoApplication rec {
pname = "google-photo-uploader"; pname = "google-photo-uploader";
version = "1.6.1"; version = "1.6.1";
src = nixpkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "int128"; owner = "int128";
repo = "gpup"; repo = "gpup";
rev = version; rev = version;
@ -14,7 +14,7 @@ buildGoApplication rec {
modules = ./gomod2nix.toml; modules = ./gomod2nix.toml;
meta = with nixpkgs.lib; { meta = {
description = "Google photos uploader, written in Go."; description = "Google photos uploader, written in Go.";
homepage = "https://github.com/int128/gpup"; homepage = "https://github.com/int128/gpup";
license = licenses.asl20; license = licenses.asl20;