From f164a272907660d37826e157d5717fa94b97a97e Mon Sep 17 00:00:00 2001 From: Natsu Kagami Date: Sun, 4 Aug 2024 22:50:17 +0200 Subject: [PATCH] Update nixpkgs --- flake.lock | 12 ++++++------ home/osu.nix | 42 +++++++++++++++++++++--------------------- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/flake.lock b/flake.lock index e9c22bc..c2b3297 100644 --- a/flake.lock +++ b/flake.lock @@ -1063,11 +1063,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1722415718, - "narHash": "sha256-5US0/pgxbMksF92k1+eOa8arJTJiPvsdZj9Dl+vJkM4=", + "lastModified": 1722640603, + "narHash": "sha256-TcXjLVNd3VeH1qKPH335Tc4RbFDbZQX+d7rqnDUoRaY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c3392ad349a5227f4a3464dce87bcc5046692fce", + "rev": "81610abc161d4021b29199aa464d6a1a521e0cc9", "type": "github" }, "original": { @@ -1223,11 +1223,11 @@ }, "nixpkgs_9": { "locked": { - "lastModified": 1722087241, - "narHash": "sha256-2ShmEaFi0kJVOEEu5gmlykN5dwjWYWYUJmlRTvZQRpU=", + "lastModified": 1722651103, + "narHash": "sha256-IRiJA0NVAoyaZeKZluwfb2DoTpBAj+FLI0KfybBeDU0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "8c50662509100d53229d4be607f1a3a31157fa12", + "rev": "a633d89c6dc9a2a8aae11813a62d7c58b2c0cc51", "type": "github" }, "original": { diff --git a/home/osu.nix b/home/osu.nix index 6163890..f757435 100644 --- a/home/osu.nix +++ b/home/osu.nix @@ -1,28 +1,28 @@ { pkgs, lib, ... }: let - # osu-pkg = pkgs.unstable.osu-lazer-bin; - osu-pkg = with pkgs; with lib; - appimageTools.wrapType2 rec { - pname = "osu-lazer-bin"; - version = "2024.731.0"; - src = fetchurl { - url = "https://github.com/ppy/osu/releases/download/${version}/osu.AppImage"; - hash = "sha256-6BxHRM7hC+v61BVqSFTzGpi7EyZQeo7kWua0CkrWiPM="; - }; - extraPkgs = pkgs: with pkgs; [ icu ]; + osu-pkg = pkgs.unstable.osu-lazer-bin; + # osu-pkg = with pkgs; with lib; + # appimageTools.wrapType2 rec { + # pname = "osu-lazer-bin"; + # version = "2024.731.0"; + # src = fetchurl { + # url = "https://github.com/ppy/osu/releases/download/${version}/osu.AppImage"; + # hash = "sha256-6BxHRM7hC+v61BVqSFTzGpi7EyZQeo7kWua0CkrWiPM="; + # }; + # extraPkgs = pkgs: with pkgs; [ icu ]; - extraInstallCommands = - let contents = appimageTools.extract { inherit pname version src; }; - in - '' - mv -v $out/bin/${pname} $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 - ''; - }; + # extraInstallCommands = + # let contents = appimageTools.extract { inherit pname version src; }; + # in + # '' + # mv -v $out/bin/${pname} $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 + # ''; + # }; in { home.packages = [ osu-pkg ];