diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2013-11-16 20:32:20 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2013-11-16 20:32:44 +0100 |
| commit | 68430cf3d7dae00f8eda1156de6b90243424e25a (patch) | |
| tree | 4b008270a344486a20c8603047821923bf71e223 /pkgs/development/libraries/atk | |
| parent | 8e0d77632e02720a8adf8126f126990501299191 (diff) | |
| parent | b5356f7f275e6fb15c6fda0ce65de26de98a87d0 (diff) | |
| download | nixpkgs-68430cf3d7dae00f8eda1156de6b90243424e25a.tar nixpkgs-68430cf3d7dae00f8eda1156de6b90243424e25a.tar.gz nixpkgs-68430cf3d7dae00f8eda1156de6b90243424e25a.tar.bz2 nixpkgs-68430cf3d7dae00f8eda1156de6b90243424e25a.tar.lz nixpkgs-68430cf3d7dae00f8eda1156de6b90243424e25a.tar.xz nixpkgs-68430cf3d7dae00f8eda1156de6b90243424e25a.tar.zst nixpkgs-68430cf3d7dae00f8eda1156de6b90243424e25a.zip | |
Merge branch master into x-updates
Conflicts (trivial, minor update on master, major here): pkgs/development/libraries/mesa/default.nix
Diffstat (limited to 'pkgs/development/libraries/atk')
| -rw-r--r-- | pkgs/development/libraries/atk/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/libraries/atk/default.nix b/pkgs/development/libraries/atk/default.nix index b023ed68904..a93aaa5a43f 100644 --- a/pkgs/development/libraries/atk/default.nix +++ b/pkgs/development/libraries/atk/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { license = "LGPLv2+"; maintainers = with stdenv.lib.maintainers; [ raskin urkud ]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; }; } |