From 1bcda85e8d127cd0f9bff4e2ee85d9a439a0a3a3 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 22 Sep 2015 11:59:39 +0200 Subject: [PATCH] swig2: Enable on Darwin (cherry picked from commit fbaaa9cccc868bd9cb33b97c08997ca37e9a66b8) Conflicts: pkgs/development/tools/misc/swig/3.x.nix --- pkgs/development/tools/misc/swig/2.x.nix | 6 +++--- pkgs/development/tools/misc/swig/3.x.nix | 7 +++---- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/misc/swig/2.x.nix b/pkgs/development/tools/misc/swig/2.x.nix index 5cfc39a5254a..48ba12ccd9c9 100644 --- a/pkgs/development/tools/misc/swig/2.x.nix +++ b/pkgs/development/tools/misc/swig/2.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, libtool, bison, pcre }: +{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, bison, pcre }: stdenv.mkDerivation rec { name = "swig-${version}"; @@ -41,8 +41,8 @@ stdenv.mkDerivation rec { # Licensing is a mess: http://www.swig.org/Release/LICENSE . license = "BSD-style"; - platforms = stdenv.lib.platforms.linux; + platforms = lib.platforms.linux ++ lib.platforms.darwin; - maintainers = with stdenv.lib.maintainers; [ urkud ]; + maintainers = [ lib.maintainers.urkud ]; }; } diff --git a/pkgs/development/tools/misc/swig/3.x.nix b/pkgs/development/tools/misc/swig/3.x.nix index 88e73276a77f..30ba50eb19da 100644 --- a/pkgs/development/tools/misc/swig/3.x.nix +++ b/pkgs/development/tools/misc/swig/3.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, libtool, bison, pcre }: +{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, bison, pcre }: stdenv.mkDerivation rec { name = "swig-${version}"; @@ -41,8 +41,7 @@ stdenv.mkDerivation rec { # Licensing is a mess: http://www.swig.org/Release/LICENSE . license = "BSD-style"; - platforms = stdenv.lib.platforms.linux; - - maintainers = with stdenv.lib.maintainers; [ urkud ]; + platforms = lib.platforms.linux ++ lib.platforms.darwin; + maintainers = [ lib.maintainers.urkud ]; }; }