Switch approaches...

This commit is contained in:
niten 2024-01-27 10:52:05 -08:00
parent fc9cf546f6
commit d698c0c761
2 changed files with 9 additions and 15 deletions

View File

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

View File

@ -1,10 +1,10 @@
{ config, lib, pkgs, ... }: { lib, buildGoApplication, ... }:
pkgs.lib.buildGoApplication rec { buildGoApplication rec {
pname = "google-photo-uploader"; pname = "google-photo-uploader";
version = "1.6.1"; version = "1.6.1";
src = pkgs.fetchFromGitHub { src = lib.fetchFromGitHub {
owner = "int128"; owner = "int128";
repo = "gpup"; repo = "gpup";
rev = version; rev = version;
@ -13,7 +13,7 @@ pkgs.lib.buildGoApplication rec {
modules = ./gomod2nix.toml; modules = ./gomod2nix.toml;
meta = with pkgs.lib; { meta = with lib; {
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;