From f530d505d4b95c8b836431974e8774972a67b073 Mon Sep 17 00:00:00 2001 From: Yarny0 <41838844+Yarny0@users.noreply.github.com> Date: Fri, 13 Jan 2023 22:02:45 +0100 Subject: [PATCH] tvbrowser: move installation directory to /share/tvbrowser In accordance to the conventions stated in the Nixpkgs manual: https://nixos.org/manual/nixpkgs/stable/#sec-language-java . --- pkgs/applications/misc/tvbrowser/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/tvbrowser/default.nix b/pkgs/applications/misc/tvbrowser/default.nix index 9d8e387dc32b..d27974588633 100644 --- a/pkgs/applications/misc/tvbrowser/default.nix +++ b/pkgs/applications/misc/tvbrowser/default.nix @@ -53,22 +53,22 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall - mkdir -p $out/share/java/${pname} - cp -R runtime/tvbrowser_linux/* $out/share/java/${pname} - rm $out/share/java/${pname}/${pname}.sh + mkdir -p $out/share/${pname} + cp -R runtime/tvbrowser_linux/* $out/share/${pname} + rm $out/share/${pname}/${pname}.sh mkdir -p $out/share/applications ln -s ${desktopItem}/share/applications/* $out/share/applications/ for i in 16 32 48 128; do mkdir -p $out/share/icons/hicolor/''${i}x''${i}/apps - ln -s $out/share/java/${pname}/imgs/${pname}$i.png $out/share/icons/hicolor/''${i}x''${i}/apps/${pname}.png + ln -s $out/share/${pname}/imgs/${pname}$i.png $out/share/icons/hicolor/''${i}x''${i}/apps/${pname}.png done mkdir -p $out/bin makeWrapper ${jdk}/bin/java $out/bin/${pname} \ --add-flags "--module-path=lib:${pname}.jar -m ${pname}/tvbrowser.TVBrowser" \ - --chdir "$out/share/java/${pname}" + --chdir "$out/share/${pname}" runHook postInstall '';