Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: correct some strange Nix path expressions #53

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: correct some strange Nix path expressions #53

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions tools/nix/flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,14 @@
};

outputs = {
self,
nixpkgs,
flake-utils,
rust-overlay,
...
}: let
# This is string (without toString it would be a `path` which is put into the store)
rootDir = toString ./. + "../../..";
lib = nixpkgs.lib;
rootDir = ./../..;
in
flake-utils.lib.eachDefaultSystem
# Creates an attribute map `{ devShells.<system>.default = ...}`
Expand All @@ -53,7 +54,6 @@

# Import nixpkgs and load it into pkgs.
# Overlay the rust toolchain
lib = nixpkgs.lib;
pkgs = import nixpkgs {
inherit system overlays;
};
Expand Down
6 changes: 3 additions & 3 deletions tools/nix/pkgs/tripsu.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@
rustc = rustToolchain;
};

cargoFile = /. + rootDir + "/Cargo.toml";
lockFile = /. + rootDir + "/Cargo.lock";
cargoFile = rootDir + "/Cargo.toml";
lockFile = rootDir + "/Cargo.lock";
in
rustPlatform.buildRustPackage {
name = "tripsu";
src = /. + rootDir;
src = rootDir;

version = (lib.importTOML cargoFile).package.version;

Expand Down