diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-03-08 09:57:58 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-03-08 09:58:19 +0100 |
| commit | 09af15654f0c8091f1b9e0bbb2e523cdee194442 (patch) | |
| tree | e648edef1ce4c64c533f2593aa22b8015cf0e506 /lib/platforms.nix | |
| parent | f306e67e15bdbe9a8358c9f81319fc4fcbadc2eb (diff) | |
| parent | 0ee75214f336474e127c2e3546c0406a0c4d5fa7 (diff) | |
Merge master into closure-size
The kde-5 stuff still didn't merge well. I hand-fixed what I saw, but there may be more problems.
Diffstat (limited to 'lib/platforms.nix')
| -rw-r--r-- | lib/platforms.nix | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/lib/platforms.nix b/lib/platforms.nix index 750829da3751a..b068d080e7521 100644 --- a/lib/platforms.nix +++ b/lib/platforms.nix @@ -1,21 +1,24 @@ let lists = import ./lists.nix; in rec { - gnu = linux; /* ++ hurd ++ kfreebsd ++ ... */ - linux = ["i686-linux" "x86_64-linux" "armv5tel-linux" "armv6l-linux" "armv7l-linux" "mips64el-linux"]; - darwin = ["x86_64-darwin"]; - freebsd = ["i686-freebsd" "x86_64-freebsd"]; - openbsd = ["i686-openbsd" "x86_64-openbsd"]; - netbsd = ["i686-netbsd" "x86_64-netbsd"]; - cygwin = ["i686-cygwin" "x86_64-cygwin"]; - illumos = ["x86_64-solaris"]; - unix = linux ++ darwin ++ freebsd ++ openbsd ++ netbsd ++ illumos; all = linux ++ darwin ++ cygwin ++ freebsd ++ openbsd ++ netbsd ++ illumos; - none = []; allBut = platforms: lists.filter (x: !(builtins.elem x platforms)) all; - mesaPlatforms = ["i686-linux" "x86_64-linux" "x86_64-darwin" "armv5tel-linux" "armv6l-linux"]; - x86_64 = ["x86_64-linux" "x86_64-darwin" "x86_64-freebsd" "x86_64-openbsd" "x86_64-netbsd" "x86_64-cygwin"]; - i686 = ["i686-linux" "i686-freebsd" "i686-netbsd" "i686-cygwin"]; + none = []; + arm = ["armv5tel-linux" "armv6l-linux" "armv7l-linux" ]; + i686 = ["i686-linux" "i686-freebsd" "i686-netbsd" "i686-cygwin"]; mips = [ "mips64el-linux" ]; + x86_64 = ["x86_64-linux" "x86_64-darwin" "x86_64-freebsd" "x86_64-openbsd" "x86_64-netbsd" "x86_64-cygwin"]; + + cygwin = ["i686-cygwin" "x86_64-cygwin"]; + darwin = ["x86_64-darwin"]; + freebsd = ["i686-freebsd" "x86_64-freebsd"]; + gnu = linux; /* ++ hurd ++ kfreebsd ++ ... */ + illumos = ["x86_64-solaris"]; + linux = ["i686-linux" "x86_64-linux" "armv5tel-linux" "armv6l-linux" "armv7l-linux" "mips64el-linux"]; + netbsd = ["i686-netbsd" "x86_64-netbsd"]; + openbsd = ["i686-openbsd" "x86_64-openbsd"]; + unix = linux ++ darwin ++ freebsd ++ openbsd ++ netbsd ++ illumos; + + mesaPlatforms = ["i686-linux" "x86_64-linux" "x86_64-darwin" "armv5tel-linux" "armv6l-linux" "armv7l-linux"]; } |