From a49cb9dcbee0fe82a5e04ff4d90c376761fd9f18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 11 Sep 2016 10:11:44 +0200 Subject: [PATCH] llvmPackages: generalize "3.9.0" string occurrences Discussed: https://github.com/NixOS/nixpkgs/commit/15af9082eb#commitcomment-18903919 --- pkgs/development/compilers/llvm/3.9/clang/default.nix | 2 +- pkgs/development/compilers/llvm/3.9/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/llvm/3.9/clang/default.nix b/pkgs/development/compilers/llvm/3.9/clang/default.nix index c6605dd656f..e75da0e9717 100644 --- a/pkgs/development/compilers/llvm/3.9/clang/default.nix +++ b/pkgs/development/compilers/llvm/3.9/clang/default.nix @@ -34,7 +34,7 @@ let # Clang expects to find sanitizer libraries in its own prefix postInstall = '' ln -sv ${llvm}/lib/LLVMgold.so $out/lib - ln -sv ${llvm}/lib/clang/3.9.0/lib $out/lib/clang/3.9.0/ + ln -sv ${llvm}/lib/clang/${version}/lib $out/lib/clang/${version}/ ln -sv $out/bin/clang $out/bin/cpp ''; diff --git a/pkgs/development/compilers/llvm/3.9/default.nix b/pkgs/development/compilers/llvm/3.9/default.nix index 7b9dbd93b2b..a39f013d1a9 100644 --- a/pkgs/development/compilers/llvm/3.9/default.nix +++ b/pkgs/development/compilers/llvm/3.9/default.nix @@ -6,7 +6,7 @@ let fetch = fetch_v version; fetch_v = ver: name: sha256: fetchurl { - url = "http://llvm.org/releases/3.9.0/${name}-${ver}.src.tar.xz"; + url = "http://llvm.org/releases/${version}/${name}-${ver}.src.tar.xz"; inherit sha256; };