From af3aeef298d176c4f01ef341bf9662dd362834e5 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Isma=C3=ABl=20Bouya?= Date: Sun, 23 Jun 2019 21:05:42 +0200 Subject: [PATCH] Use nix-instantiate to get nixpkgs location --- Makefile | 2 +- nixops/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 3ab58cf..d17ef19 100644 --- a/Makefile +++ b/Makefile @@ -23,7 +23,7 @@ nix-info: @version=$$(nix eval --raw nixpkgs.lib.version) && \ mainversion=$$(echo $$version | cut -d"." -f -2) && \ echo "https://releases.nixos.org/nixos/$$mainversion/nixos-$$version/nixexprs.tar.xz" && \ - nix eval --raw nixpkgs.bc.meta.position | cut -d"/" -f-4 + nix-instantiate --find-file nixpkgs nix-info-nixops: @$(MAKE) --no-print-directory -C nixops/ nix-info diff --git a/nixops/Makefile b/nixops/Makefile index 6adc6e7..6087402 100644 --- a/nixops/Makefile +++ b/nixops/Makefile @@ -16,7 +16,7 @@ nix-info: @version=$$(nix eval --raw nixpkgs.lib.version) && \ mainversion=$$(echo $$version | cut -d"." -f -2) && \ echo "https://releases.nixos.org/nixos/$$mainversion/nixos-$$version/nixexprs.tar.xz" && \ - nix eval --raw nixpkgs.bc.meta.position | cut -d"/" -f-4 + nix-instantiate --find-file nixpkgs .PHONY: nix-info ###### Initial setup -- 2.41.0