]> git.immae.eu Git - perso/Immae/Config/Nix.git/commitdiff
Use nix-instantiate to get nixpkgs location
authorIsmaël Bouya <ismael.bouya@normalesup.org>
Sun, 23 Jun 2019 19:05:42 +0000 (21:05 +0200)
committerIsmaël Bouya <ismael.bouya@normalesup.org>
Sun, 23 Jun 2019 19:06:35 +0000 (21:06 +0200)
Makefile
nixops/Makefile

index 3ab58cf65e74aa89208aee22702331fca09293c6..d17ef1911f04d077646d576491eb77acec9fd854 100644 (file)
--- 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
index 6adc6e76766aa2b941738cd53b0b663588f4c474..6087402690961068b4a6a635967f92b34805a1b2 100644 (file)
@@ -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