materus/Nixerus
1
0
Fork 0
mirror of https://github.com/materusPL/Nixerus.git synced 2026-06-19 00:47:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: materus:b151b5139b93a9bf7d990f112ed3bc55358bfa68
Branches Tags
materus:master
materus:dependabot/github_actions/cachix/cachix-action-17
materus:testing
materus:mock
..
compare: materus:ba3310fb537a6990c5d35f5df524e59921586dfd
Branches Tags
materus:master
materus:dependabot/github_actions/cachix/cachix-action-17
materus:testing
materus:mock

4 Commits
b151b5139b ... ba3310fb53

Author SHA1 Message Date
materus
ba3310fb53
Merge pull request #21 from materusPL/dependabot/github_actions/actions/checkout-6 
build(deps): bump actions/checkout from 4 to 6
 2026-06-09 17:48:29 +02:00
materus
6b9c35b717
polymc: Fix after update to 26.05 2026-06-09 17:28:58 +02:00
materus
5d933e0d79
Update to 26.05 2026-06-09 17:16:27 +02:00
dependabot[bot]
b4b190bfe0
build(deps): bump actions/checkout from 4 to 6 
Bumps [actions/checkout](https://github.com/actions/checkout) from 4 to 6.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v4...v6)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-version: '6'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
 2025-11-24 15:34:03 +00:00
4 changed files with 18 additions and 20 deletions
Show Stats Expand all files Collapse all files

4
.github/workflows/build.yml vendored
View File

@ -35,11 +35,11 @@ jobs:
nixPath:
- nixpkgs=channel:nixos-unstable
- nixpkgs=channel:nixpkgs-unstable
- nixpkgs=channel:nixos-25.11
- nixpkgs=channel:nixos-26.05
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v4
uses: actions/checkout@v6
- name: Install nix
uses: cachix/install-nix-action@v31
with:

24
flake.lock generated
View File

@ -28,11 +28,11 @@
]
},
"locked": {
"lastModified": 1756022458,
"narHash": "sha256-J1i35r4HfNDdPpwL0vOBaZopQudAUVtartEerc1Jryc=",
"lastModified": 1781009359,
"narHash": "sha256-w/mZkRscTatf8NWyUstli8ROzM/eopxZzi0WRjoeYkU=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "9e3a33c0bcbc25619e540b9dfea372282f8a9740",
"rev": "c58ead12efcac436afffa93a22099a5595eb4157",
"type": "github"
},
"original": {
@ -44,11 +44,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1755615617,
"narHash": "sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs+StOp19xNsbqdOg=",
"lastModified": 1780749050,
"narHash": "sha256-3av0pIjlOWQ6rDbNOmpUSvbNnJkGORQKKjb4LtCZsIY=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "20075955deac2583bb12f07151c2df830ef346b4",
"rev": "a799d3e3886da994fa307f817a6bc705ae538eeb",
"type": "github"
},
"original": {
@ -60,11 +60,11 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1755615617,
"narHash": "sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs+StOp19xNsbqdOg=",
"lastModified": 1780749050,
"narHash": "sha256-3av0pIjlOWQ6rDbNOmpUSvbNnJkGORQKKjb4LtCZsIY=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "20075955deac2583bb12f07151c2df830ef346b4",
"rev": "a799d3e3886da994fa307f817a6bc705ae538eeb",
"type": "github"
},
"original": {
@ -80,11 +80,11 @@
"nixpkgs": "nixpkgs_2"
},
"locked": {
"lastModified": 1756145408,
"narHash": "sha256-ltkbs5Watrq+V2l9hWefSdM7cfvxLkabtMJeZn0MiCo=",
"lastModified": 1781015510,
"narHash": "sha256-DqRzaFfLijAyd3TDilgKEjNiqJ1UVymA/seyVamoWS4=",
"owner": "nix-community",
"repo": "NUR",
"rev": "c9c985b60eb46d97370f7d3fefdc300b953c044d",
"rev": "961e2e196da88c8d6513bb8e9865ec5e5a6cb954",
"type": "github"
},
"original": {

9
pkgs/apps/games/polymc/default.nix
View File

@ -9,7 +9,7 @@
ghc_filesystem,
zlib,
file,
wrapQtAppsHook,
kdePackages,
xorg,
libpulseaudio,
openal,
@ -27,7 +27,6 @@
addDriverRunpath,
vulkan-loader,
msaClientID ? null,
extra-cmake-modules,
qtcharts,
makeWrapper,
gamemode,
@ -65,7 +64,7 @@ let
gameLibraryPath = libpath + ":${addDriverRunpath.driverLink}/lib";
in
stdenv.mkDerivation rec {
pname = "polymc" + (lib.optionalString ((lib.versions.major qtbase.version) == "5") "-qt5");
pname = "polymc";
version = "7.0";
patches = [
# Fix for Qt >= 6.9.0
@ -95,10 +94,10 @@ let
dontWrapQtApps = true;
nativeBuildInputs = [
cmake
extra-cmake-modules
ninja
jdk
wrapQtAppsHook
kdePackages.extra-cmake-modules
kdePackages.wrapQtAppsHook
file
ghc_filesystem
];

1
pkgs/default.nix
View File

@ -12,7 +12,6 @@ rec {
ffmpeg_7-amf-full = (pkgs.ffmpeg_7-full.overrideAttrs (finalAttrs: previousAttrs: { configureFlags = previousAttrs.configureFlags ++ [ "--enable-amf" ]; buildInputs = previousAttrs.buildInputs ++ [ pkgs.amf-headers ]; }));
polymc = pkgs.qt6Packages.callPackage ./apps/games/polymc { };
polymc-qt5 = pkgs.libsForQt5.callPackage ./apps/games/polymc { };
alvr = pkgs.callPackage ./apps/games/alvr { };