From de4320eefb7000aaeaa74420c076586bf4a770bf Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Sat, 26 Mar 2022 15:15:39 +0800 Subject: [PATCH] improve package names --- flake.nix | 2 +- nix/windows/default.nix | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/flake.nix b/flake.nix index a98c367d5..da94de64e 100644 --- a/flake.nix +++ b/flake.nix @@ -129,7 +129,7 @@ ]; }; devShells.x86_64-linux.msys2 = pkgs.mkShell { - name = "nac3-dev-shell"; + name = "nac3-dev-shell-msys2"; buildInputs = with pkgs; [ curl pacman diff --git a/nix/windows/default.nix b/nix/windows/default.nix index 6b4701b8a..5db2101f2 100644 --- a/nix/windows/default.nix +++ b/nix/windows/default.nix @@ -33,13 +33,14 @@ let }; in rec { llvm-nac3 = pkgs.stdenvNoCC.mkDerivation rec { - name = "llvm-nac3-msys2"; + pname = "llvm-nac3-msys2"; + version = "13.0.1"; src-llvm = pkgs.fetchurl { - url = "https://github.com/llvm/llvm-project/releases/download/llvmorg-13.0.1/llvm-13.0.1.src.tar.xz"; + url = "https://github.com/llvm/llvm-project/releases/download/llvmorg-${version}/llvm-${version}.src.tar.xz"; sha256 = "sha256-7GuA2Cw4SsrS3BkpA6bPLNuv+4ibhL+5janXHmMPyDQ="; }; src-clang = pkgs.fetchurl { - url = "https://github.com/llvm/llvm-project/releases/download/llvmorg-13.0.1/clang-13.0.1.src.tar.xz"; + url = "https://github.com/llvm/llvm-project/releases/download/llvmorg-${version}/clang-${version}.src.tar.xz"; sha256 = "sha256-eHqeLZn1yHIKoXc+S+AJRhzTDTvUD90kWR5HNGfJF8k="; }; buildInputs = [ pkgs.wineWowPackages.stable ]; @@ -75,7 +76,7 @@ in rec { ''; }; nac3artiq = pkgs.rustPlatform.buildRustPackage { - name = "nac3artiq"; + name = "nac3artiq-msys2"; src = ../.; cargoLock = { lockFile = ../Cargo.lock; }; nativeBuildInputs = [ pkgs.wineWowPackages.stable pkgs.zip ];