From 3f769d34a055e0eb880b2adf44f499bc4f99e95b Mon Sep 17 00:00:00 2001 From: Danilo Reyes Date: Sat, 19 Oct 2024 17:38:27 -0600 Subject: [PATCH] pureref 2, added pkg to load source file --- modules/apps/art.nix | 4 ++-- overlay.nix | 3 ++- pkgs/pureref/default.nix | 34 +++++++++++----------------------- 3 files changed, 15 insertions(+), 26 deletions(-) diff --git a/modules/apps/art.nix b/modules/apps/art.nix index 0e896d4..d37c3f8 100644 --- a/modules/apps/art.nix +++ b/modules/apps/art.nix @@ -17,16 +17,16 @@ mypaint # not the best art program mypaint-brushes # but it's got some mypaint-brushes1 # nice damn brushes - # pureref # create inspiration/reference boards blender # cgi animation and sculpting # drawpile # arty party with friends!! + (callPackage ../../pkgs/pureref/default.nix { }) # create inspiration/reference boards ]) ++ ( if config.my.dev.gameDev.enable then with pkgs; [ godot_4 # game development - # gdtoolkit # gdscript language server + gdtoolkit_4 # gdscript language server ] else [ ] diff --git a/overlay.nix b/overlay.nix index de77893..60a5902 100644 --- a/overlay.nix +++ b/overlay.nix @@ -37,7 +37,7 @@ _self: super: { ]; }; inherit (pkgsU) planify; - inherit (pkgsU) gdtoolkit; + inherit (pkgsU) gdtoolkit_4; inherit (pkgsU) ns-usbloader; inherit (pkgsU) collector; inherit (pkgsU) homepage-dashboard; @@ -51,6 +51,7 @@ _self: super: { inherit (pkgsU) prowlarr; inherit (pkgsU) jellyfin; inherit (pkgsU) jellyfin-ffmpeg; + inherit (pkgsU) pureref; inherit (pkgsM) gallery-dl; inherit (pkgsM) yt-dlp; handbrake = super.handbrake.override { useGtk = true; }; diff --git a/pkgs/pureref/default.nix b/pkgs/pureref/default.nix index 01a0f8d..c0a7371 100644 --- a/pkgs/pureref/default.nix +++ b/pkgs/pureref/default.nix @@ -1,37 +1,25 @@ { lib, appimageTools, - runCommand, - curl, - gnugrep, - cacert, + requireFile, }: appimageTools.wrapType1 rec { pname = "pureref"; - version = "2.0.0"; + version = "2.0.3"; - src = - runCommand "PureRef-${version}_x64.Appimage" - { - nativeBuildInputs = [ - curl - gnugrep - cacert - ]; - outputHash = "sha256-47DEQpj8HBSa+/TImW+5JCeuQeRkm5NMpJWZG3hSuFU="; - } - '' - key="$(curl "https://www.pureref.com/download.php" --silent | grep '%3D%3D' | cut -d '"' -f2)" - curl "https://www.pureref.com/files/build.php?build=LINUX64.Appimage&version=${version}&downloadKey=$key" --output $out - ''; + src = requireFile { + name = "PureRef-${version}_x64.Appimage"; + sha256 = "d2247570fdac66f596a8ac11030aba2ff6e62014981caae523cbbc57684035f3"; + url = "https://www.pureref.com/download.php"; + }; - meta = { + meta = with lib; { description = "Reference Image Viewer"; homepage = "https://www.pureref.com"; - license = lib.licenses.unfree; - maintainers = [ lib.maintainers.elnudev ]; + license = licenses.unfree; + maintainers = with maintainers; [ elnudev ]; platforms = [ "x86_64-linux" ]; - sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; + sourceProvenance = [ sourceTypes.binaryNativeCode ]; }; }