diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 867a7878..4429daa8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -18,7 +18,7 @@ jobs: - wine-ge - wine-osu - wine-tkg - - umu + - umu-launcher uses: ./.github/workflows/nix.yml with: diff --git a/flake.lock b/flake.lock index 8ea7dedd..68a442fe 100644 --- a/flake.lock +++ b/flake.lock @@ -49,32 +49,7 @@ "root": { "inputs": { "flake-parts": "flake-parts", - "nixpkgs": "nixpkgs", - "umu": "umu" - } - }, - "umu": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "dir": "packaging/nix", - "lastModified": 1738306689, - "narHash": "sha256-g1p++aLe6q6OdGy3K91uyCjAeBUkkT4uoItSFQT+PJw=", - "ref": "refs/heads/main", - "rev": "7a71163b79e56222fe3f3097d1e71208a91a1a3b", - "revCount": 917, - "submodules": true, - "type": "git", - "url": "https://github.com/Open-Wine-Components/umu-launcher/?dir=packaging/nix" - }, - "original": { - "dir": "packaging/nix", - "submodules": true, - "type": "git", - "url": "https://github.com/Open-Wine-Components/umu-launcher/?dir=packaging/nix" + "nixpkgs": "nixpkgs" } } }, diff --git a/flake.nix b/flake.nix index 8529b1d3..5b3eecb6 100644 --- a/flake.nix +++ b/flake.nix @@ -4,10 +4,6 @@ inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; flake-parts.url = "github:hercules-ci/flake-parts"; - umu = { - url = "git+https://github.com/Open-Wine-Components/umu-launcher/?dir=packaging\/nix&submodules=1"; - inputs.nixpkgs.follows = "nixpkgs"; - }; }; outputs = {self, ...} @ inputs: diff --git a/npins/sources.json b/npins/sources.json index 7a01ade2..3a2165cc 100644 --- a/npins/sources.json +++ b/npins/sources.json @@ -117,6 +117,18 @@ "url": "https://github.com/GloriousEggroll/proton-wine/archive/39021e609a24b6aeffdf9c4695a286d71e7dffbc.tar.gz", "hash": "000d5kba7vs5nc1sc3946jkpqmch4w09qz74i5zgc7nh7znck6f8" }, + "umu-launcher": { + "type": "Git", + "repository": { + "type": "GitHub", + "owner": "Open-Wine-Components", + "repo": "umu-launcher" + }, + "branch": "main", + "revision": "7a71163b79e56222fe3f3097d1e71208a91a1a3b", + "url": "https://github.com/Open-Wine-Components/umu-launcher/archive/7a71163b79e56222fe3f3097d1e71208a91a1a3b.tar.gz", + "hash": "1s3fblgbm9cvmv6m93lbvg48dhwjldp46yniwaffx1r7dm7sxmsg" + }, "vkd3d-proton": { "type": "GitRelease", "repository": { diff --git a/pkgs/default.nix b/pkgs/default.nix index dfbc145a..3b5889ad 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -32,7 +32,23 @@ // extra)) .${wine}; in { - inherit (inputs.umu.packages.${system}) umu; + umu = self.lib.mkDeprecated "warn" config.packages.umu-launcher { + name = "umu"; + target = "package"; + date = "2025-02-04"; + instructions = '' + This package has been renamed to `umu-launcher` to + match the package name in nixpkgs. + ''; + }; + umu-launcher-unwrapped = pkgs.callPackage "${pins.umu-launcher}/packaging/nix/unwrapped.nix" { + inherit (pkgs) umu-launcher-unwrapped; + version = builtins.substring 0 7 pins.umu-launcher.revision; + }; + umu-launcher = pkgs.callPackage "${pins.umu-launcher}/packaging/nix/package.nix" { + inherit (pkgs) umu-launcher; + inherit (config.packages) umu-launcher-unwrapped; + }; dxvk = pkgs.callPackage ./dxvk {inherit pins;}; dxvk-w32 = pkgs.pkgsCross.mingw32.callPackage ./dxvk {inherit pins;}; dxvk-w64 = pkgs.pkgsCross.mingwW64.callPackage ./dxvk {inherit pins;}; @@ -61,7 +77,7 @@ }; osu-stable = pkgs.callPackage ./osu-stable { - inherit (config.packages) osu-mime proton-osu-bin umu; + inherit (config.packages) osu-mime proton-osu-bin umu-launcher; wine = config.packages.wine-osu; wine-discord-ipc-bridge = config.packages.wine-discord-ipc-bridge.override {wine = config.packages.wine-osu;}; }; @@ -91,7 +107,7 @@ star-citizen = pkgs.callPackage ./star-citizen { wine = pkgs.wineWowPackages.staging; winetricks = config.packages.winetricks-git; - inherit (config.packages) umu; + inherit (config.packages) umu-launcher; }; star-citizen-umu = config.packages.star-citizen.override {useUmu = true;}; diff --git a/pkgs/osu-stable/default.nix b/pkgs/osu-stable/default.nix index 50f94cd2..25b77cee 100644 --- a/pkgs/osu-stable/default.nix +++ b/pkgs/osu-stable/default.nix @@ -7,12 +7,12 @@ wine-discord-ipc-bridge, winetricks, wine, - umu, + umu-launcher, proton-osu-bin, wineFlags ? "", pname ? "osu-stable", location ? "$HOME/.osu", - useUmu ? false, + useUmu ? true, protonPath ? "${proton-osu-bin.steamcompattool}", protonVerbs ? ["waitforexitandrun"], tricks ? ["gdiplus" "dotnet45" "meiryo"], @@ -47,7 +47,7 @@ PATH=${ lib.makeBinPath ( if useUmu - then [umu] + then [umu-launcher] else [wine winetricks] ) }:$PATH diff --git a/pkgs/star-citizen/default.nix b/pkgs/star-citizen/default.nix index fe8208c9..8afaedbb 100644 --- a/pkgs/star-citizen/default.nix +++ b/pkgs/star-citizen/default.nix @@ -8,7 +8,7 @@ winetricks, wine, dxvk, - umu, + umu-launcher, proton-ge-bin, wineFlags ? "", pname ? "star-citizen", @@ -81,7 +81,7 @@ PATH=${ lib.makeBinPath ( if useUmu - then [umu] + then [umu-launcher] else [wine winetricks] ) }:$PATH