Skip to content

Commit

Permalink
[Chore] Wrap 'update-daemon' with 'nix' from 'nixpkgs'
Browse files Browse the repository at this point in the history
Problem: 'update-daemon' binary is currently wrapped with an old 'nix'
version that is coming from a separate input.

Solution: Use 'nix' from 'nixpkgs' input instead to keep it up to date
with our 'nixpkgs' fork.
  • Loading branch information
rvem committed Feb 27, 2024
1 parent 121d3a0 commit f4193c8
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 80 deletions.
84 changes: 8 additions & 76 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@
naersk.url = "github:nix-community/naersk";
};

outputs = { self, nixpkgs, flake-utils, nix, serokell-nix, naersk, ... }:
outputs = { self, nixpkgs, flake-utils, serokell-nix, naersk, ... }:
flake-utils.lib.eachSystem [ "x86_64-linux" ] (system:
let
pkgs = nixpkgs.legacyPackages.${system}.extend serokell-nix.overlay;
naersk' = pkgs.callPackage naersk {};
nix' = nix.defaultPackage.${system};
nix = nixpkgs.packages.${system}.nix;

update-daemon = naersk'.buildPackage {
src = builtins.path {
Expand All @@ -40,7 +40,7 @@

postInstall =
"wrapProgram $out/bin/update-daemon --prefix PATH : ${
pkgs.lib.makeBinPath [ nix' pkgs.gitMinimal ]
pkgs.lib.makeBinPath [ nix pkgs.gitMinimal ]
}";

cargoTestCommands = x: x ++ [
Expand Down Expand Up @@ -74,7 +74,7 @@
buildInputs = with pkgs; [
rustc
rust.packages.stable.rustPlatform.rustLibSrc
nix'
nix
cargo
rust-analyzer
rustfmt
Expand Down

0 comments on commit f4193c8

Please sign in to comment.