ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-25 12:22:37 +03:00
Code Issues Projects Releases Wiki Activity

otool: fix licenses, adding the new APSL 2.0 as well

Browse Source 
Now Hydra can build glib introspection and all that depends on it
(just darwin).
This commit is contained in:
Vladimír Čunát 2013-08-13 07:32:34 +02:00
parent 0656eff736
commit 11c8ca0a1a
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/lib/licenses.nix
View File

@ -28,6 +28,12 @@
url = "http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/licenses/AMD-ADL?revision=1.1"; url = "http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/licenses/AMD-ADL?revision=1.1";
}; };
apsl20 = {
shortName = "APSL 2.0";
fullName = "Apple Public Source License 2.0";
url = http://opensource.org/licenses/APSL-2.0;
};
asl20 = { asl20 = {
shortName = "ASL2.0"; shortName = "ASL2.0";
fullName = "Apache Software License 2.0"; fullName = "Apache Software License 2.0";

8
pkgs/os-specific/darwin/otool/default.nix
View File

@ -1,7 +1,11 @@
{ stdenv }: { stdenv }:
# this tool only exists on darwin
assert stdenv.isDarwin; assert stdenv.isDarwin;
/* this tool only exists on darwin
NOTE: it might make sense to compile this from source (maybe it even works for non-darwin)
I see cctools source is under GPL2+ as well as APSL 2.0
http://opensource.apple.com/release/developer-tools-46/
*/
stdenv.mkDerivation { stdenv.mkDerivation {
name = "otool"; name = "otool";
@ -20,7 +24,7 @@ stdenv.mkDerivation {
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Object file displaying tool"; description = "Object file displaying tool";
homepage = https://developer.apple.com/library/mac/documentation/Darwin/Reference/ManPages/man1/otool.1.html; homepage = https://developer.apple.com/library/mac/documentation/Darwin/Reference/ManPages/man1/otool.1.html;
license = licenses.unfree; license = with licenses; [ apsl20 gpl2Plus ];
maintainers = with maintainers; [ lovek323 ]; maintainers = with maintainers; [ lovek323 ];
platforms = platforms.darwin; platforms = platforms.darwin;