Unverified Commit 01e0a89f authored by Aleksana's avatar Aleksana Committed by GitHub
Browse files

nero-umu: 1.1.1 -> 1.1.2 (#420441)

parents 18b00c27 43bbaca7

pkgs/by-name/ne/nero-umu/nerofs.patch

deleted100644 → 0
+0 −57
Original line number Diff line number Diff line 
--- a/src/nerofs.cpp

+++ b/src/nerofs.cpp

@@ -173,31 +173,19 @@

 

 QString NeroFS::GetIcoextract()

 {

-    // TODO: this is for flexibility in sandboxed environments(?)

-    // idk what the "good" path should be for Flatpak, so...

-    if(QDir("/usr/bin").exists("icoextract")) {

-        return "/usr/bin/icoextract";

-    } else return "";

+    return QStandardPaths::findExecutable("icoextract");

 }

 

 

 QString NeroFS::GetIcoutils()

 {

-    // TODO: this is for flexibility in sandboxed environments(?)

-    // idk what the "good" path should be for Flatpak, so...

-    if(QDir("/usr/bin").exists("icotool")) {

-        return "/usr/bin/icotool";

-    } else return "";

+    return QStandardPaths::findExecutable("icotool");

 }

 

 

 QString NeroFS::GetUmU()

 {

-    // TODO: this is for flexibility in sandboxed environments(?)

-    // idk what the "good" path should be for Flatpak, so...

-    if(QDir("/usr/bin").exists("umu-run")) {

-        return "/usr/bin/umu-run";

-    } else return "";

+    return QStandardPaths::findExecutable("umu-run");

 }

 

 QString NeroFS::GetWinetricks(const QString &runner)

@@ -207,17 +195,13 @@

             return protonsPath.path() + '/' + runner + "/protonfixes/winetricks";

         else {

             // fall back to system winetricks

-            if(QDir("/usr/bin").exists("winetricks"))

-                return "/usr/bin/winetricks";

-            else return "";

+            return QStandardPaths::findExecutable("winetricks");

         }

     } else if(QDir(protonsPath.path() + '/' + currentRunner + "/protonfixes").exists("winetricks"))

         return protonsPath.path() + '/' + currentRunner + "/protonfixes/winetricks";

     else {

         // fall back to system winetricks

-        if(QDir("/usr/bin").exists("winetricks"))

-            return "/usr/bin/winetricks";

-        else return "";

+        return QStandardPaths::findExecutable("winetricks");

     }

 }

pkgs/by-name/ne/nero-umu/neroprefix.patch

deleted100644 → 0
+0 −11
Original line number Diff line number Diff line 
--- a/src/neroprefixsettings.cpp

+++ b/src/neroprefixsettings.cpp

@@ -598,7 +598,7 @@

         tmpDir.mkdir("nero-manager");

     QProcess process;

     process.setWorkingDirectory(tmpDir.path()+"/nero-manager");

-    process.start("/usr/bin/curl", { "-o", "bridge.zip", "-L", "https://github.com/EnderIce2/rpc-bridge/releases/latest/download/bridge.zip" });

+    process.start(QStandardPaths::findExecutable("curl"), { "-o", "bridge.zip", "-L", "https://github.com/EnderIce2/rpc-bridge/releases/latest/download/bridge.zip" });

     printf("Downloading Discord RPC Bridge...\n");

 

     NeroPrefixSettingsWindow::blockSignals(true);

pkgs/by-name/ne/nero-umu/package.nix

+2 −8
Original line number Diff line number Diff line
@@ -18,13 +18,13 @@ 
}:

stdenv.mkDerivation (finalAttrs: {

  pname = "nero-umu";

  version = "1.1.1";

  version = "1.1.2";



  src = fetchFromGitHub {

    owner = "SeongGino";

    repo = "Nero-umu";

    tag = "v${finalAttrs.version}";

    hash = "sha256-sX/Z/b5stauut8qg6IV/DdsCIkdx1N3+y1jwoXHr1LY=";

    hash = "sha256-7Wmha/WsSmbEgD2Dw2izSRzw8ldIrWcRIdUMp2okHWY=";

  };



  #Replace quazip git submodule with pre-packaged quazip
@@ -62,12 +62,6 @@ stdenv.mkDerivation (finalAttrs: { 
    (lib.cmakeFeature "NERO_QT_VERSION" "Qt6")

  ];



  #Fixes to be able to find binaries for nix

  patches = [

    ./nerofs.patch

    ./neroprefix.patch

  ];



  installPhase = ''

    runHook preInstall

    install -Dm755 "nero-umu" "$out/bin/nero-umu"