Compare commits
3 Commits
f6c453bfaf
...
762d481707
Author | SHA1 | Date | |
---|---|---|---|
![]() |
762d481707 | ||
![]() |
39344fe5fa | ||
![]() |
da43c4be97 |
5
flake.lock
generated
5
flake.lock
generated
@ -13,9 +13,8 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "numtide",
|
"id": "flake-utils",
|
||||||
"repo": "flake-utils",
|
"type": "indirect"
|
||||||
"type": "github"
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
|
62
flake.nix
62
flake.nix
@ -2,23 +2,23 @@
|
|||||||
inputs = {
|
inputs = {
|
||||||
nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
|
nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
|
||||||
rust-overlay.url = "github:oxalica/rust-overlay";
|
rust-overlay.url = "github:oxalica/rust-overlay";
|
||||||
flake-utils.url = "github:numtide/flake-utils";
|
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = { self, nixpkgs, flake-utils, rust-overlay , ...}:
|
outputs = { self, nixpkgs, flake-utils, rust-overlay , ...}:
|
||||||
flake-utils.lib.eachDefaultSystem (system:
|
|
||||||
let
|
let
|
||||||
overlays = [ (import rust-overlay) ];
|
overlays = [ (import rust-overlay ) ];
|
||||||
|
in {
|
||||||
|
packages."x86_64-linux".default =
|
||||||
|
let
|
||||||
pkgs = import nixpkgs {
|
pkgs = import nixpkgs {
|
||||||
inherit system overlays;
|
system = "x86_64-linux";
|
||||||
|
inherit overlays;
|
||||||
};
|
};
|
||||||
native-deps = with pkgs; [
|
native-deps = with pkgs; [
|
||||||
pkg-config pipewire lld clang libclang alsa-lib openssl zlib libxkbcommon libGL wayland mangohud
|
pkg-config pipewire lld clang libclang alsa-lib openssl zlib libxkbcommon libGL wayland mangohud
|
||||||
];
|
];
|
||||||
in
|
in
|
||||||
with pkgs;
|
pkgs.mkShell {
|
||||||
{
|
|
||||||
devShells.default = mkShell {
|
|
||||||
buildInputs = with pkgs; [
|
buildInputs = with pkgs; [
|
||||||
(rust-bin.stable.latest.default.override {
|
(rust-bin.stable.latest.default.override {
|
||||||
extensions = [ "rust-src" ];
|
extensions = [ "rust-src" ];
|
||||||
@ -27,9 +27,51 @@
|
|||||||
cargo-bloat
|
cargo-bloat
|
||||||
pkgs.pkgsCross.mingwW64.buildPackages.gcc
|
pkgs.pkgsCross.mingwW64.buildPackages.gcc
|
||||||
] ++ native-deps;
|
] ++ native-deps;
|
||||||
LD_LIBRARY_PATH = (lib.makeLibraryPath native-deps);
|
LD_LIBRARY_PATH = (pkgs.lib.makeLibraryPath native-deps);
|
||||||
CARGO_TARGET_X86_64_PC_WINDOWS_GNU_RUSTFLAGS = "-L native=${pkgs.pkgsCross.mingwW64.windows.pthreads}/lib";
|
CARGO_TARGET_X86_64_PC_WINDOWS_GNU_RUSTFLAGS = "-L native=${pkgs.pkgsCross.mingwW64.windows.pthreads}/lib";
|
||||||
};
|
};
|
||||||
}
|
packages."aarch64-darwin".default =
|
||||||
);
|
let
|
||||||
|
pkgs = import nixpkgs {
|
||||||
|
system = "aarch64-darwin";
|
||||||
|
inherit overlays;
|
||||||
|
};
|
||||||
|
native-deps = with pkgs; [];
|
||||||
|
in
|
||||||
|
pkgs.mkShell {
|
||||||
|
buildInputs = with pkgs; [
|
||||||
|
(rust-bin.stable.latest.default.override {
|
||||||
|
extensions = [ "rust-src" ];
|
||||||
|
targets = ["aarch64-apple-darwin" ];
|
||||||
|
})
|
||||||
|
cargo-bloat
|
||||||
|
] ++ native-deps;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
# flake-utils.lib.eachDefaultSystem (system:
|
||||||
|
# let
|
||||||
|
# overlays = [ (import rust-overlay) ];
|
||||||
|
# pkgs = import nixpkgs {
|
||||||
|
# inherit system overlays;
|
||||||
|
# };
|
||||||
|
# native-deps = with pkgs; [
|
||||||
|
# pkg-config pipewire lld clang libclang alsa-lib openssl zlib libxkbcommon libGL wayland mangohud
|
||||||
|
# ];
|
||||||
|
# in
|
||||||
|
# with pkgs;
|
||||||
|
# {
|
||||||
|
# devShells.default = mkShell {
|
||||||
|
# buildInputs = with pkgs; [
|
||||||
|
# (rust-bin.stable.latest.default.override {
|
||||||
|
# extensions = [ "rust-src" ];
|
||||||
|
# targets = ["x86_64-unknown-linux-gnu" "x86_64-pc-windows-gnu"];
|
||||||
|
# })
|
||||||
|
# cargo-bloat
|
||||||
|
# pkgs.pkgsCross.mingwW64.buildPackages.gcc
|
||||||
|
# ] ++ native-deps;
|
||||||
|
# LD_LIBRARY_PATH = (lib.makeLibraryPath native-deps);
|
||||||
|
# CARGO_TARGET_X86_64_PC_WINDOWS_GNU_RUSTFLAGS = "-L native=${pkgs.pkgsCross.mingwW64.windows.pthreads}/lib";
|
||||||
|
# };
|
||||||
|
# }
|
||||||
|
# );
|
||||||
}
|
}
|
||||||
|
@ -18,7 +18,7 @@ fn get_steam_root() -> anyhow::Result<PathBuf> {
|
|||||||
fn get_steam_root() -> anyhow::Result<PathBuf> {
|
fn get_steam_root() -> anyhow::Result<PathBuf> {
|
||||||
use registry::{self, Security, Data};
|
use registry::{self, Security, Data};
|
||||||
|
|
||||||
let key = registry::Hive::LocalMachine.open(r"\SOFTWARE\Wow6432Node\Valve\Steam", Security::Read)?;
|
let key = registry::Hive::LocalMachine.open(r"SOFTWARE\Wow6432Node\Valve\Steam", Security::Read)?;
|
||||||
let value = match key.value("InstallPath")? {
|
let value = match key.value("InstallPath")? {
|
||||||
Data::String(s) => Some(s.to_string_lossy()),
|
Data::String(s) => Some(s.to_string_lossy()),
|
||||||
Data::ExpandString(s) => Some(s.to_string_lossy()),
|
Data::ExpandString(s) => Some(s.to_string_lossy()),
|
||||||
|
Loading…
x
Reference in New Issue
Block a user