swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-20 12:29:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

treewide: use llvm6 in some places

Browse source 
Not everything works on llvm7. It’s easiest to just provide the llvm6
as backup in this case.
This commit is contained in:
Matthew Bauer 2019-04-22 21:16:59 -04:00
parent ffeffb3851
commit c72c6a48ca
3 changed files with 31 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/desktops/gnustep/default.nix
View file

@ -1,4 +1,4 @@
{ pkgs, newScope }: { pkgs, newScope, stdenv, llvmPackages_6 }:
let let
callPackage = newScope self; callPackage = newScope self;
@ -10,7 +10,9 @@ let
gorm = callPackage ./gorm {}; gorm = callPackage ./gorm {};
projectcenter = callPackage ./projectcenter {}; projectcenter = callPackage ./projectcenter {};
system_preferences = callPackage ./systempreferences {}; system_preferences = callPackage ./systempreferences {};
libobjc = callPackage ./libobjc2 {}; libobjc = callPackage ./libobjc2 {
stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv;
};
make = callPackage ./make {}; make = callPackage ./make {};
back = callPackage ./back {}; back = callPackage ./back {};
base = callPackage ./base { giflib = pkgs.giflib_4_1; }; base = callPackage ./base { giflib = pkgs.giflib_4_1; };

5
pkgs/tools/package-management/nix/default.nix
View file

@ -3,6 +3,7 @@
, stateDir ? "/nix/var" , stateDir ? "/nix/var"
, confDir ? "/etc" , confDir ? "/etc"
, boehmgc , boehmgc
, llvmPackages_6
}: }:
let let
@ -174,6 +175,8 @@ in rec {
}; };
inherit storeDir stateDir confDir boehmgc; inherit storeDir stateDir confDir boehmgc;
stdenv = llvmPackages_6.stdenv;
}; };
nixUnstable = lib.lowPrio (callPackage common rec { nixUnstable = lib.lowPrio (callPackage common rec {
@ -188,6 +191,8 @@ in rec {
fromGit = true; fromGit = true;
inherit storeDir stateDir confDir boehmgc; inherit storeDir stateDir confDir boehmgc;
stdenv = llvmPackages_6.stdenv;
}); });
} }

27
pkgs/top-level/all-packages.nix
View file

@ -3375,7 +3375,9 @@ in
hdf4 = null; hdf4 = null;
}; };
haproxy = callPackage ../tools/networking/haproxy { }; haproxy = callPackage ../tools/networking/haproxy {
stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv;
};
haveged = callPackage ../tools/security/haveged { }; haveged = callPackage ../tools/security/haveged { };
@ -6925,7 +6927,10 @@ in
cryptol = haskell.lib.justStaticExecutables haskellPackages.cryptol; cryptol = haskell.lib.justStaticExecutables haskellPackages.cryptol;
inherit (callPackages ../development/compilers/crystal {}) inherit (callPackages ../development/compilers/crystal {
stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv;
inherit (llvmPackages_6) clang llvm;
})
crystal_0_25 crystal_0_25
crystal_0_26 crystal_0_26
crystal; crystal;
@ -8100,7 +8105,9 @@ in
lush2 = callPackage ../development/interpreters/lush {}; lush2 = callPackage ../development/interpreters/lush {};
maude = callPackage ../development/interpreters/maude { }; maude = callPackage ../development/interpreters/maude {
stdenv = if stdenv.cc.isClang then llvmPackages_5.stdenv else stdenv;
};
me_cleaner = pythonPackages.callPackage ../tools/misc/me_cleaner { }; me_cleaner = pythonPackages.callPackage ../tools/misc/me_cleaner { };
@ -8183,7 +8190,9 @@ in
php = php73-unit; php = php73-unit;
}); });
inherit (callPackages ../development/interpreters/php { }) inherit (callPackages ../development/interpreters/php {
stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv;
})
php71 php71
php72 php72
php73; php73;
@ -9800,9 +9809,13 @@ in
cln = callPackage ../development/libraries/cln { }; cln = callPackage ../development/libraries/cln { };
clucene_core_2 = callPackage ../development/libraries/clucene-core/2.x.nix { }; clucene_core_2 = callPackage ../development/libraries/clucene-core/2.x.nix {
stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv;
};
clucene_core_1 = callPackage ../development/libraries/clucene-core { }; clucene_core_1 = callPackage ../development/libraries/clucene-core {
stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv;
};
clucene_core = clucene_core_1; clucene_core = clucene_core_1;
@ -22543,11 +22556,13 @@ in
root = callPackage ../applications/science/misc/root { root = callPackage ../applications/science/misc/root {
inherit (darwin) cf-private; inherit (darwin) cf-private;
inherit (darwin.apple_sdk.frameworks) Cocoa OpenGL; inherit (darwin.apple_sdk.frameworks) Cocoa OpenGL;
stdenv = if stdenv.cc.isClang then llvmPackages_5.stdenv else stdenv;
}; };
root5 = lowPrio (callPackage ../applications/science/misc/root/5.nix { root5 = lowPrio (callPackage ../applications/science/misc/root/5.nix {
inherit (darwin) cf-private; inherit (darwin) cf-private;
inherit (darwin.apple_sdk.frameworks) Cocoa OpenGL; inherit (darwin.apple_sdk.frameworks) Cocoa OpenGL;
stdenv = if stdenv.cc.isClang then llvmPackages_5.stdenv else stdenv;
}); });
rink = callPackage ../applications/science/misc/rink { }; rink = callPackage ../applications/science/misc/rink { };