diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2013-03-02 10:41:53 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2013-03-02 10:41:53 +0100 |
| commit | 26af997d41444e71074c41e82c2eb869b33758f1 (patch) | |
| tree | eb4f7fcc4a71a18c85452c927dedc9d9744ad21f /pkgs/development/compilers | |
| parent | 97b24ed95acdd7ad4d7e94b94c0a6eaf3d5fa92a (diff) | |
| parent | a920c50cfbe849c9062de81bde050b5672e4e42c (diff) | |
| download | nixlib-26af997d41444e71074c41e82c2eb869b33758f1.tar nixlib-26af997d41444e71074c41e82c2eb869b33758f1.tar.gz nixlib-26af997d41444e71074c41e82c2eb869b33758f1.tar.bz2 nixlib-26af997d41444e71074c41e82c2eb869b33758f1.tar.lz nixlib-26af997d41444e71074c41e82c2eb869b33758f1.tar.xz nixlib-26af997d41444e71074c41e82c2eb869b33758f1.tar.zst nixlib-26af997d41444e71074c41e82c2eb869b33758f1.zip | |
Merge branch 'master' into stdenv-updates
Conflicts (simple): pkgs/applications/networking/browsers/chromium/default.nix pkgs/development/libraries/libsoup/default.nix pkgs/os-specific/linux/kernel/manual-config.nix pkgs/os-specific/linux/qemu-kvm/default.nix
Diffstat (limited to 'pkgs/development/compilers')
| -rw-r--r-- | pkgs/development/compilers/scala/default.nix | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/pkgs/development/compilers/scala/default.nix b/pkgs/development/compilers/scala/default.nix index a78ee06f652d..e7c2c80ac55c 100644 --- a/pkgs/development/compilers/scala/default.nix +++ b/pkgs/development/compilers/scala/default.nix @@ -28,5 +28,6 @@ stdenv.mkDerivation rec { ''; homepage = http://www.scala-lang.org/; license = "BSD"; + platforms = stdenv.lib.platforms.all; }; } |