From 589acaf73273660992dde16018d087735c30a4fb Mon Sep 17 00:00:00 2001 From: Shawn8901 Date: Sun, 7 Jul 2024 22:29:03 +0200 Subject: [PATCH] portfolio: migrate to pkgs/by-name --- .../default.nix => by-name/po/portfolio/package.nix} | 4 ++-- pkgs/top-level/all-packages.nix | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) rename pkgs/{applications/office/portfolio/default.nix => by-name/po/portfolio/package.nix} (97%) diff --git a/pkgs/applications/office/portfolio/default.nix b/pkgs/by-name/po/portfolio/package.nix similarity index 97% rename from pkgs/applications/office/portfolio/default.nix rename to pkgs/by-name/po/portfolio/package.nix index 119804dddfef..1bc1d68a2970 100644 --- a/pkgs/applications/office/portfolio/default.nix +++ b/pkgs/by-name/po/portfolio/package.nix @@ -7,7 +7,7 @@ glibc, gcc-unwrapped, gtk3, - jre, + openjdk17, libsecret, makeDesktopItem, webkitgtk, @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { makeWrapper $out/portfolio/PortfolioPerformance $out/bin/portfolio \ --prefix LD_LIBRARY_PATH : "${runtimeLibs}" \ - --prefix PATH : ${jre}/bin + --prefix PATH : ${openjdk17}/bin # Create desktop item mkdir -p $out/share/applications diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e439820389df..c89999ba4a34 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32917,10 +32917,6 @@ with pkgs; polyphone = libsForQt5.callPackage ../applications/audio/polyphone { }; - portfolio = callPackage ../applications/office/portfolio { - jre = openjdk17; - }; - psi-notify = callPackage ../applications/misc/psi-notify { }; ptex = callPackage ../development/libraries/ptex { };