diff options
author | Azat Bahawi <azat@bahawi.net> | 2022-09-11 19:28:11 +0300 |
---|---|---|
committer | Azat Bahawi <azat@bahawi.net> | 2022-09-11 19:28:11 +0300 |
commit | 96ca9558928f4ffc9a99a94059fcd93d0a9de761 (patch) | |
tree | 4c89ece6605c439b8c3bf4531f4c9fcde8bf7245 /packages | |
parent | 2022-09-10 (diff) |
2022-09-11
Diffstat (limited to '')
-rw-r--r-- | packages/mpv-autosub.nix | 2 | ||||
-rw-r--r-- | packages/throttled.nix | 14 | ||||
-rw-r--r-- | packages/ultimmc.nix | 35 |
3 files changed, 30 insertions, 21 deletions
diff --git a/packages/mpv-autosub.nix b/packages/mpv-autosub.nix index cebab76..b7804a1 100644 --- a/packages/mpv-autosub.nix +++ b/packages/mpv-autosub.nix @@ -5,7 +5,7 @@ }: stdenvNoCC.mkDerivation rec { pname = "mpv-autosub"; - version = "unstable-"; + version = "git"; src = fetchFromGitHub { owner = "davidde"; diff --git a/packages/throttled.nix b/packages/throttled.nix index ff896cf..1c0f853 100644 --- a/packages/throttled.nix +++ b/packages/throttled.nix @@ -1,25 +1,25 @@ { fetchFromGitHub, kmod, - python3, + python3Packages, stdenv, }: stdenv.mkDerivation rec { pname = "throttled"; - version = "unstable-2022-06-30"; + version = "git"; src = fetchFromGitHub { owner = "erpalma"; repo = pname; - rev = "ab9641a93a409bdc7fca6889ff23ca5a685e5a77"; - hash = "sha256-Zd+rTsVDkw9mq6k2OkMy+HxyYsl3ADy1fEM/1e/jxAs="; + rev = "1dd726672f0b11b813d4c7b63e0157becde7a013"; + hash = "sha256-0MsPp6y4r/uZB2SplKV+SAiJoxIs2jgOQmQoQQ2ZKwI="; }; - nativeBuildInputs = with python3.pkgs; [wrapPython]; + nativeBuildInputs = with python3Packages; [wrapPython]; pythonPath = - (with python3.pkgs; [configparser dbus-python pygobject3]) - ++ [kmod]; + [kmod] + ++ (with python3Packages; [configparser dbus-python pygobject3]); installPhase = '' runHook preInstall diff --git a/packages/ultimmc.nix b/packages/ultimmc.nix index dcb646a..86377b4 100644 --- a/packages/ultimmc.nix +++ b/packages/ultimmc.nix @@ -3,6 +3,7 @@ fetchFromGitHub, jdk, makeDesktopItem, + ninja, qtbase, stdenv, wrapQtAppsHook, @@ -10,19 +11,27 @@ }: stdenv.mkDerivation rec { pname = "UltimMC"; - version = "unstable-2022-07-20"; + version = "git"; src = fetchFromGitHub { owner = "UltimMC"; repo = "Launcher"; - rev = "a522ec3ad4602de1f457a25bce98ef912a29d7d6"; - hash = "sha256-+UgBblyEx0cKH8UMBOPtjhQLv2YUKj91UokQWKCEPbY="; + rev = "6bfa07e728865d8d31a43ef5231b2461d55fc4b3"; fetchSubmodules = true; + hash = "sha256-gMEjy1jM/T7Un4FDNbAd9AAdVUOHRfL+arhahHPCBFo="; }; - nativeBuildInputs = [cmake jdk wrapQtAppsHook]; + nativeBuildInputs = [ + cmake + jdk + ninja + wrapQtAppsHook + ]; - buildInputs = [qtbase zlib]; + buildInputs = [ + qtbase + zlib + ]; postPatch = '' substituteInPlace CMakeLists.txt \ @@ -33,11 +42,9 @@ stdenv.mkDerivation rec { --replace '"jars"' '"../share/${pname}/jar"'; ''; - cmakeFlags = ["-DCMAKE_BUILD_TYPE=Release"]; - desktopItem = makeDesktopItem { name = pname; - exec = pname; + exec = "DevLauncher"; icon = pname; desktopName = pname; genericName = "Custom Minecraft launcher"; @@ -47,11 +54,7 @@ stdenv.mkDerivation rec { dontWrapQtApps = true; postInstall = '' - rm $out/${pname} - - wrapProgram $out/bin/${pname} \ - --add-flags "--dir \''${XDG_DATA_HOME:-~/.local/share}/${pname}" \ - "''${qtWrapperArgs[@]}" + rm $out/DevLauncher install -Dm644 \ ${desktopItem}/share/applications/${pname}.desktop \ @@ -60,4 +63,10 @@ stdenv.mkDerivation rec { $src/notsecrets/logo.svg \ $out/share/icons/hicolor/scalable/apps/${pname}.svg ''; + + postFixup = '' + wrapProgram $out/bin/DevLauncher \ + --add-flags "--dir \''${XDG_DATA_HOME:-~/.local/share}/${pname}" \ + "''${qtWrapperArgs[@]}" + ''; } |