Compare commits

..

No commits in common. "ba3310fb537a6990c5d35f5df524e59921586dfd" and "b151b5139b93a9bf7d990f112ed3bc55358bfa68" have entirely different histories.

4 changed files with 20 additions and 18 deletions

View File

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

24
flake.lock generated
View File

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

View File

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

View File

@ -12,6 +12,7 @@ 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 { };