outfoxxed/nixnew
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

move msi specific packages to msi

Browse source
This commit is contained in:
outfoxxed 2025-07-24 19:17:56 -07:00
parent 43b2004ed5
commit c115bb6fc5
Signed by: outfoxxed
GPG key ID: 4C88A185FB89301E
3 changed files with 4 additions and 78 deletions
Download patch file Download diff file Expand all files Collapse all files

5
modules/user/general.nix
View file

@ -112,7 +112,6 @@
home.packages = with pkgs; [
kwrite
krita
gimp
vlc
mpv
@ -130,10 +129,8 @@
ripgrep
fd
qbittorrent
signal-desktop
anki-bin
kid3
wireshark
mumble
freetube
jujutsu
@ -142,8 +139,6 @@
xdg-utils
light
kicad
unrar # used by ark
libnotify # test with it a lot

4
systems/msi/default.nix
View file

@ -17,6 +17,10 @@
home-manager.users.${config.main-user} = {
home.packages = with pkgs; [
osu-lazer-bin
kicad
wireshark
krita
signal-desktop
];
services.blueman-applet.enable = true;

73
systems/msi/osu.nix
View file

@ -1,73 +0,0 @@
{ lib
, stdenv
, fetchurl
, fetchzip
, appimageTools
}:
let
pname = "osu-lazer-bin";
version = "2024.221.0";
src = {
aarch64-darwin = fetchzip {
url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Apple.Silicon.zip";
hash = "sha256-U7i3rO7NVbBdOFMYpGrjI7LC//TEon3vdAHzjKeGsuk=";
stripRoot = false;
};
x86_64-darwin = fetchzip {
url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Intel.zip";
hash = "sha256-HEx1ZxxXnsHUD8Cqzld3RQoPZOfiXEmInlUMZVdDt6E=";
stripRoot = false;
};
x86_64-linux = fetchurl {
url = "https://github.com/ppy/osu/releases/download/${version}/osu.AppImage";
hash = "sha256-UY1HSOpcir9ybcxDuicklArynOFWkDtKqJe/LGeQOEM=";
};
}.${stdenv.system} or (throw "${pname}-${version}: ${stdenv.system} is unsupported.");
meta = {
description = "Rhythm is just a *click* away (AppImage version for score submission and multiplayer, and binary distribution for Darwin systems)";
homepage = "https://osu.ppy.sh";
license = with lib.licenses; [
mit
cc-by-nc-40
unfreeRedistributable # osu-framework contains libbass.so in repository
];
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
maintainers = with lib.maintainers; [ delan gepbird spacefault stepbrobd ];
mainProgram = "osu!";
platforms = [ "aarch64-darwin" "x86_64-darwin" "x86_64-linux" ];
};
passthru.updateScript = ./update-bin.sh;
in
if stdenv.isDarwin
then stdenv.mkDerivation {
inherit pname version src meta passthru;
installPhase = ''
runHook preInstall
APP_DIR="$out/Applications"
mkdir -p "$APP_DIR"
cp -r . "$APP_DIR"
runHook postInstall
'';
}
else appimageTools.wrapType2 {
inherit pname version src meta passthru;
extraPkgs = pkgs: with pkgs; [ icu ];
extraInstallCommands =
let
contents = appimageTools.extract { inherit pname version src; };
in
''
mv -v $out/bin/${pname}-${version} $out/bin/osu\!
install -m 444 -D ${contents}/osu\!.desktop -t $out/share/applications
for i in 16 32 48 64 96 128 256 512 1024; do
install -D ${contents}/osu\!.png $out/share/icons/hicolor/''${i}x$i/apps/osu\!.png
done
'';
}