diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2015-07-25 09:13:52 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2015-07-25 09:13:52 +0200 |
commit | 389c90aa868f16165610b1efe34f344a02105ab6 (patch) | |
tree | 61417aed0f6a40e83bd0b6a9a538f37da3b80052 /pkgs | |
parent | 99457b40ac3a1404287c671f82d1a2ebbcbcbcc5 (diff) | |
download | nixlib-389c90aa868f16165610b1efe34f344a02105ab6.tar nixlib-389c90aa868f16165610b1efe34f344a02105ab6.tar.gz nixlib-389c90aa868f16165610b1efe34f344a02105ab6.tar.bz2 nixlib-389c90aa868f16165610b1efe34f344a02105ab6.tar.lz nixlib-389c90aa868f16165610b1efe34f344a02105ab6.tar.xz nixlib-389c90aa868f16165610b1efe34f344a02105ab6.tar.zst nixlib-389c90aa868f16165610b1efe34f344a02105ab6.zip |
llvmPackages*: refactor to use callPackage, etc.
Also use recurseIntoAttrs only on the default version (instead of only on 3.4). The "self" variants (stil) don't build and they're inconsistent versions. /cc @shlevy (fea2266290d6).
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/compilers/llvm/3.6/default.nix | 2 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 21 |
2 files changed, 10 insertions, 13 deletions
diff --git a/pkgs/development/compilers/llvm/3.6/default.nix b/pkgs/development/compilers/llvm/3.6/default.nix index 65d81711f9e2..c99070ba383f 100644 --- a/pkgs/development/compilers/llvm/3.6/default.nix +++ b/pkgs/development/compilers/llvm/3.6/default.nix @@ -1,4 +1,4 @@ -{ pkgs, newScope, stdenv, isl, fetchurl, overrideCC, wrapCC }: +{ newScope, stdenv, isl, fetchurl, overrideCC, wrapCC }: let callPackage = newScope (self // { inherit stdenv isl version fetch; }); diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b350b63af70b..7889e5c334d8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4143,24 +4143,21 @@ let llvm_36 = llvmPackages_36.llvm; llvm_35 = llvmPackages_35.llvm; llvm_34 = llvmPackages_34.llvm; - llvm_33 = llvm_v ../development/compilers/llvm/3.3/llvm.nix; + llvm_33 = callPackage ../development/compilers/llvm/3.3/llvm.nix { }; - llvm_v = path: callPackage path { }; + llvmPackages = recurseIntoAttrs llvmPackages_36; - llvmPackages = llvmPackages_36; + llvmPackagesSelf = llvmPackages_34.override { + stdenv = libcxxStdenv; + }; - llvmPackages_34 = recurseIntoAttrs (import ../development/compilers/llvm/3.4 { - inherit stdenv newScope fetchurl; + llvmPackages_34 = callPackage ../development/compilers/llvm/3.4 { isl = isl_0_12; - }); - llvmPackagesSelf = import ../development/compilers/llvm/3.4 { inherit newScope fetchurl; isl = isl_0_12; stdenv = libcxxStdenv; }; - - llvmPackages_35 = import ../development/compilers/llvm/3.5 { - inherit pkgs stdenv newScope fetchurl isl; }; - llvmPackages_36 = import ../development/compilers/llvm/3.6 { - inherit pkgs stdenv newScope fetchurl isl wrapCC; + llvmPackages_35 = callPackage ../development/compilers/llvm/3.5 { }; + + llvmPackages_36 = callPackage ../development/compilers/llvm/3.6 { inherit (stdenvAdapters) overrideCC; }; |