From 11c8ca0a1a48e645825504a0ef78b1d0d6c7052a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 13 Aug 2013 07:32:34 +0200 Subject: [PATCH] otool: fix licenses, adding the new APSL 2.0 as well Now Hydra can build glib introspection and all that depends on it (just darwin). --- pkgs/lib/licenses.nix | 6 ++++++ pkgs/os-specific/darwin/otool/default.nix | 8 ++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/lib/licenses.nix b/pkgs/lib/licenses.nix index fcf7420e425..ec2f9aca95f 100644 --- a/pkgs/lib/licenses.nix +++ b/pkgs/lib/licenses.nix @@ -28,6 +28,12 @@ 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 = { shortName = "ASL2.0"; fullName = "Apache Software License 2.0"; diff --git a/pkgs/os-specific/darwin/otool/default.nix b/pkgs/os-specific/darwin/otool/default.nix index c998253d148..671e51542d0 100644 --- a/pkgs/os-specific/darwin/otool/default.nix +++ b/pkgs/os-specific/darwin/otool/default.nix @@ -1,7 +1,11 @@ { stdenv }: -# this tool only exists on darwin 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 { name = "otool"; @@ -20,7 +24,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Object file displaying tool"; 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 ]; platforms = platforms.darwin;