mirror of
https://github.com/PrismLauncher/PrismLauncher.git
synced 2026-06-29 01:54:20 +03:00
fix(nix): switch to KF6 ECM (#5545)
This commit is contained in:
commit
a80995ab7e
2 changed files with 13 additions and 5 deletions
8
flake.lock
generated
8
flake.lock
generated
|
|
@ -18,11 +18,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1777578337,
|
"lastModified": 1778443072,
|
||||||
"narHash": "sha256-fN6ynMvcdwPDB09LpWJNO5ogu+HFydrBWXJywoI/NNg=",
|
"narHash": "sha256-rNDJzV2JTV5SUTwv1cgKZYMdyoUYU9/YfegSaUf3QfY=",
|
||||||
"rev": "15f4ee454b1dce334612fa6843b3e05cf546efab",
|
"rev": "da5ad661ba4e5ef59ba743f0d112cbc30e474f32",
|
||||||
"type": "tarball",
|
"type": "tarball",
|
||||||
"url": "https://releases.nixos.org/nixos/unstable/nixos-26.05pre990025.15f4ee454b1d/nixexprs.tar.xz"
|
"url": "https://releases.nixos.org/nixos/unstable/nixos-26.05pre995699.da5ad661ba4e/nixexprs.tar.xz"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"type": "tarball",
|
"type": "tarball",
|
||||||
|
|
|
||||||
|
|
@ -3,12 +3,12 @@
|
||||||
stdenv,
|
stdenv,
|
||||||
cmake,
|
cmake,
|
||||||
cmark,
|
cmark,
|
||||||
extra-cmake-modules,
|
|
||||||
gamemode,
|
gamemode,
|
||||||
jdk17,
|
jdk17,
|
||||||
kdePackages,
|
kdePackages,
|
||||||
libnbtplusplus,
|
libnbtplusplus,
|
||||||
ninja,
|
ninja,
|
||||||
|
pkg-config,
|
||||||
qrencode,
|
qrencode,
|
||||||
self,
|
self,
|
||||||
stripJavaArchivesHook,
|
stripJavaArchivesHook,
|
||||||
|
|
@ -35,6 +35,13 @@ let
|
||||||
]
|
]
|
||||||
else
|
else
|
||||||
"unknown";
|
"unknown";
|
||||||
|
|
||||||
|
# Remove once https://github.com/NixOS/nixpkgs/pull/518987 lands
|
||||||
|
extra-cmake-modules = kdePackages.extra-cmake-modules.overrideAttrs (prevAttrs: {
|
||||||
|
meta = prevAttrs.meta // {
|
||||||
|
platforms = lib.platforms.all;
|
||||||
|
};
|
||||||
|
});
|
||||||
in
|
in
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
|
|
@ -65,6 +72,7 @@ stdenv.mkDerivation {
|
||||||
cmake
|
cmake
|
||||||
ninja
|
ninja
|
||||||
extra-cmake-modules
|
extra-cmake-modules
|
||||||
|
pkg-config
|
||||||
jdk17
|
jdk17
|
||||||
stripJavaArchivesHook
|
stripJavaArchivesHook
|
||||||
];
|
];
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue