From 2c8898e1591895b9221288970d1fb647a8559f27 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Fri, 12 Mar 2021 00:36:45 +0700 Subject: [PATCH 01/33] clucene-core: expand platforms to unix --- pkgs/development/libraries/clucene-core/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/clucene-core/default.nix b/pkgs/development/libraries/clucene-core/default.nix index 20b0a3b547c..8d5b389150a 100644 --- a/pkgs/development/libraries/clucene-core/default.nix +++ b/pkgs/development/libraries/clucene-core/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { CLucene is a port of the very popular Java Lucene text search engine API. ''; homepage = "http://clucene.sourceforge.net"; - platforms = platforms.linux; + platforms = platforms.unix; license = with licenses; [ asl20 lgpl2 ]; }; } From 3029c47d196ad9cec450ea423f097163a5cf0f2a Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Fri, 12 Mar 2021 12:15:20 +0700 Subject: [PATCH 02/33] coan: expand platforms to all --- pkgs/development/tools/analysis/coan/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/analysis/coan/default.nix b/pkgs/development/tools/analysis/coan/default.nix index 1e0b79e0daa..3ef6c2b8459 100644 --- a/pkgs/development/tools/analysis/coan/default.nix +++ b/pkgs/development/tools/analysis/coan/default.nix @@ -28,6 +28,6 @@ stdenv.mkDerivation rec { ''; homepage = "http://coan2.sourceforge.net/"; license = licenses.bsd3; - platforms = platforms.linux; + platforms = platforms.all; }; } From 4bc8ecf07abce521a17edd004348d634addb12cd Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Fri, 12 Mar 2021 01:04:34 +0700 Subject: [PATCH 03/33] gtkdatabox: expand platforms to unix --- pkgs/development/libraries/gtkdatabox/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/gtkdatabox/default.nix b/pkgs/development/libraries/gtkdatabox/default.nix index d7cca43841e..ddab0046b66 100644 --- a/pkgs/development/libraries/gtkdatabox/default.nix +++ b/pkgs/development/libraries/gtkdatabox/default.nix @@ -17,6 +17,6 @@ stdenv.mkDerivation rec { license = lib.licenses.lgpl2; - platforms = lib.platforms.linux; + platforms = lib.platforms.unix; }; } From f0f899ce10015af74d9377bec60e9f935fd8b371 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Fri, 12 Mar 2021 00:36:00 +0700 Subject: [PATCH 04/33] guile-opengl: expand platforms to unix --- pkgs/development/guile-modules/guile-opengl/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/guile-modules/guile-opengl/default.nix b/pkgs/development/guile-modules/guile-opengl/default.nix index effa651b99c..5ada5d41c7d 100644 --- a/pkgs/development/guile-modules/guile-opengl/default.nix +++ b/pkgs/development/guile-modules/guile-opengl/default.nix @@ -18,6 +18,6 @@ in stdenv.mkDerivation { homepage = "https://www.gnu.org/software/guile-opengl/"; license = licenses.gpl3Plus; maintainers = with maintainers; [ vyp ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } From d97968e29f1eb04620e1d80de17cb1a1a3e07ed3 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Fri, 12 Mar 2021 01:41:17 +0700 Subject: [PATCH 05/33] htmlcxx: fix darwin build --- pkgs/development/libraries/htmlcxx/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/htmlcxx/default.nix b/pkgs/development/libraries/htmlcxx/default.nix index 286834112f2..d9072e46e40 100644 --- a/pkgs/development/libraries/htmlcxx/default.nix +++ b/pkgs/development/libraries/htmlcxx/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl }: +{ lib, stdenv, fetchurl, libiconv }: stdenv.mkDerivation rec { pname = "htmlcxx"; @@ -9,12 +9,13 @@ stdenv.mkDerivation rec { sha256 = "1hgmyiad3qgbpf2dvv2jygzj6jpz4dl3n8ds4nql68a4l9g2nm07"; }; + buildInputs = [ libiconv ]; patches = [ ./ptrdiff.patch ]; meta = with lib; { homepage = "http://htmlcxx.sourceforge.net/"; description = "A simple non-validating css1 and html parser for C++"; license = licenses.lgpl2; - platforms = platforms.linux; + platforms = platforms.all; }; } From 076c9dbef27ce682c00fc5484a134843c88ca07c Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Fri, 12 Mar 2021 01:49:28 +0700 Subject: [PATCH 06/33] kissfft: fix darwin build --- pkgs/development/libraries/kissfft/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/kissfft/default.nix b/pkgs/development/libraries/kissfft/default.nix index 5395ac4ab9c..fe52adfa20d 100644 --- a/pkgs/development/libraries/kissfft/default.nix +++ b/pkgs/development/libraries/kissfft/default.nix @@ -30,6 +30,11 @@ stdenv.mkDerivation rec { }) ]; + postPatch = '' + substituteInPlace Makefile \ + --replace "gcc" "${stdenv.cc.targetPrefix}cc" \ + --replace "ar" "${stdenv.cc.targetPrefix}ar" + ''; makeFlags = [ "PREFIX=${placeholder "out"}" "DATATYPE=double" @@ -40,6 +45,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/mborgerding/kissfft"; license = licenses.bsd3; maintainers = [ maintainers.goibhniu ]; - platforms = platforms.linux; + platforms = platforms.all; }; } From fc348a5c6debb709e7d1584d0a10b8a9aba63c0b Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Fri, 12 Mar 2021 01:49:46 +0700 Subject: [PATCH 07/33] levmar: fix darwin build --- pkgs/development/libraries/levmar/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/levmar/default.nix b/pkgs/development/libraries/levmar/default.nix index c5d6877a844..ed945d9e5a0 100644 --- a/pkgs/development/libraries/levmar/default.nix +++ b/pkgs/development/libraries/levmar/default.nix @@ -9,8 +9,9 @@ stdenv.mkDerivation rec { }; patchPhase = '' - sed -i 's/define HAVE_LAPACK/undef HAVE_LAPACK/' levmar.h + substituteInPlace levmar.h --replace "define HAVE_LAPACK" "undef HAVE_LAPACK" sed -i 's/LAPACKLIBS=.*/LAPACKLIBS=/' Makefile + substituteInPlace Makefile --replace "gcc" "${stdenv.cc.targetPrefix}cc" ''; installPhase = '' @@ -23,6 +24,6 @@ stdenv.mkDerivation rec { description = "ANSI C implementations of Levenberg-Marquardt, usable also from C++"; homepage = "https://www.ics.forth.gr/~lourakis/levmar/"; license = lib.licenses.gpl2Plus; - platforms = lib.platforms.linux; + platforms = lib.platforms.all; }; } From c29546f2e03b8089e09677586dfb2035858ee64a Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Fri, 12 Mar 2021 01:42:04 +0700 Subject: [PATCH 08/33] libcli: fix darwin build --- pkgs/development/libraries/libcli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libcli/default.nix b/pkgs/development/libraries/libcli/default.nix index ceb0338e5cc..8aa06bfb19b 100644 --- a/pkgs/development/libraries/libcli/default.nix +++ b/pkgs/development/libraries/libcli/default.nix @@ -20,12 +20,12 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - makeFlags = [ "PREFIX=$(out)" ]; + makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" "AR=${stdenv.cc.targetPrefix}ar" "PREFIX=$(out)" ]; meta = with lib; { description = "Emulate a Cisco-style telnet command-line interface"; homepage = "http://sites.dparrish.com/libcli"; license = licenses.lgpl21Plus; - platforms = platforms.linux; + platforms = platforms.all; }; } From ead72e396fb86447b0abba68664b3de93726787c Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Fri, 12 Mar 2021 00:37:03 +0700 Subject: [PATCH 09/33] libcredis: expand platforms to all --- pkgs/development/libraries/libcredis/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libcredis/default.nix b/pkgs/development/libraries/libcredis/default.nix index 902f5a6ee26..247d341bce9 100644 --- a/pkgs/development/libraries/libcredis/default.nix +++ b/pkgs/development/libraries/libcredis/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { description = "C client library for Redis (key-value database)"; homepage = "https://code.google.com/archive/p/credis/"; license = licenses.bsd3; # from homepage - platforms = platforms.linux; + platforms = platforms.all; maintainers = [ maintainers.bjornfor ]; }; } From d440a94c0497d7a00b8cfa110911b2d6b9723193 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Fri, 12 Mar 2021 01:03:44 +0700 Subject: [PATCH 10/33] libcsptr: expand platforms to all --- pkgs/development/libraries/libcsptr/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libcsptr/default.nix b/pkgs/development/libraries/libcsptr/default.nix index e30165054aa..a8f33deda36 100644 --- a/pkgs/development/libraries/libcsptr/default.nix +++ b/pkgs/development/libraries/libcsptr/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { description = "Smart pointer constructs for the (GNU) C programming language"; homepage = "https://github.com/Snaipe/libcsptr"; license = licenses.mit; - platforms = [ "i686-linux" "x86_64-linux" ]; + platforms = platforms.all; maintainers = [ maintainers.fragamus ]; }; } From e5cfd956d8fe11156a2feabfda1925992f68360d Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Fri, 12 Mar 2021 01:04:59 +0700 Subject: [PATCH 11/33] liblcf: expand platforms to all --- pkgs/development/libraries/liblcf/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/liblcf/default.nix b/pkgs/development/libraries/liblcf/default.nix index 2c7f0989282..1e6f57368b7 100644 --- a/pkgs/development/libraries/liblcf/default.nix +++ b/pkgs/development/libraries/liblcf/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/EasyRPG/liblcf"; license = licenses.mit; maintainers = with maintainers; [ yegortimoshenko ]; - platforms = platforms.linux; + platforms = platforms.all; }; } From e8ddcf9db42d2e4ad66cbc819804e9abc36575ea Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Fri, 12 Mar 2021 01:42:22 +0700 Subject: [PATCH 12/33] libnatpmp: fix darwin build --- pkgs/development/libraries/libnatpmp/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libnatpmp/default.nix b/pkgs/development/libraries/libnatpmp/default.nix index dd902c0021d..11b8d66b4a8 100644 --- a/pkgs/development/libraries/libnatpmp/default.nix +++ b/pkgs/development/libraries/libnatpmp/default.nix @@ -10,6 +10,12 @@ stdenv.mkDerivation rec { sha256 = "1c1n8n7mp0amsd6vkz32n8zj3vnsckv308bb7na0dg0r8969rap1"; }; + postPatch = '' + substituteInPlace Makefile \ + --replace "gcc" "${stdenv.cc.targetPrefix}cc" \ + --replace "ar" "${stdenv.cc.targetPrefix}ar" + ''; + makeFlags = [ "INSTALLPREFIX=$(out)" ]; meta = with lib; { @@ -17,6 +23,6 @@ stdenv.mkDerivation rec { description = "NAT-PMP client"; license = licenses.bsd3; maintainers = with maintainers; [ orivej ]; - platforms = platforms.linux; + platforms = platforms.all; }; } From 5f808e1251abe842ab3e9395a87bb893846864e0 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Fri, 12 Mar 2021 01:03:23 +0700 Subject: [PATCH 13/33] libnest2d: expand platforms to all --- pkgs/development/libraries/libnest2d/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libnest2d/default.nix b/pkgs/development/libraries/libnest2d/default.nix index 567598500d6..1e666758f81 100644 --- a/pkgs/development/libraries/libnest2d/default.nix +++ b/pkgs/development/libraries/libnest2d/default.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { "2D irregular bin packaging and nesting library written in modern C++"; homepage = "https://github.com/Ultimaker/libnest2d"; license = licenses.lgpl3; - platforms = platforms.linux; + platforms = platforms.all; }; } From db02458ebb256f4ab391b7aad000f15d51bfe60a Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Fri, 12 Mar 2021 01:02:42 +0700 Subject: [PATCH 14/33] liboauth: expand platforms to all --- pkgs/development/libraries/liboauth/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/liboauth/default.nix b/pkgs/development/libraries/liboauth/default.nix index caab0a83fcf..5fe5ba86bea 100644 --- a/pkgs/development/libraries/liboauth/default.nix +++ b/pkgs/development/libraries/liboauth/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - platforms = platforms.linux; + platforms = platforms.all; description = "C library implementing the OAuth secure authentication protocol"; homepage = "http://liboauth.sourceforge.net/"; repositories.git = "https://github.com/x42/liboauth.git"; From e02d375471a8774f296097106258da6416d516c3 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Fri, 12 Mar 2021 12:19:17 +0700 Subject: [PATCH 15/33] libosip: expand platforms to all --- pkgs/development/libraries/osip/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/osip/default.nix b/pkgs/development/libraries/osip/default.nix index 322ed30a847..b7cfc5da9d3 100644 --- a/pkgs/development/libraries/osip/default.nix +++ b/pkgs/development/libraries/osip/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { homepage = "https://www.gnu.org/software/osip/"; description = "The GNU oSIP library, an implementation of the Session Initiation Protocol (SIP)"; maintainers = with lib.maintainers; [ raskin ]; - platforms = lib.platforms.linux; + platforms = lib.platforms.all; inherit version; }; } From 9139e83f6baad17d8da0ef00002fb4a10249c412 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Fri, 12 Mar 2021 12:19:37 +0700 Subject: [PATCH 16/33] libxmi: expand platforms to unix --- pkgs/development/libraries/libxmi/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libxmi/default.nix b/pkgs/development/libraries/libxmi/default.nix index 037e7036f49..b9a2b6de3cc 100644 --- a/pkgs/development/libraries/libxmi/default.nix +++ b/pkgs/development/libraries/libxmi/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { description = "Library for rasterizing 2-D vector graphics"; homepage = "https://www.gnu.org/software/libxmi/"; license = lib.licenses.gpl2Plus; - platforms = lib.platforms.gnu ++ lib.platforms.linux; # arbitrary choice + platforms = lib.platforms.unix; maintainers = [ ]; }; } From fe4574d67ce3f259b9b0573867fdc49849e53e60 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Fri, 12 Mar 2021 12:19:49 +0700 Subject: [PATCH 17/33] lightning: expand platforms to all --- pkgs/development/libraries/lightning/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/lightning/default.nix b/pkgs/development/libraries/lightning/default.nix index 5fdc06bce01..5f8c71fa6aa 100644 --- a/pkgs/development/libraries/lightning/default.nix +++ b/pkgs/development/libraries/lightning/default.nix @@ -27,6 +27,6 @@ stdenv.mkDerivation rec { ''; maintainers = [ maintainers.AndersonTorres ]; license = licenses.lgpl3Plus; - platforms = lib.platforms.linux; + platforms = lib.platforms.all; }; } From 27f00d3e08637b373760cca4af282aab36decb71 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Fri, 12 Mar 2021 12:20:22 +0700 Subject: [PATCH 18/33] libxmp: expand platforms to all --- pkgs/development/libraries/libxmp/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libxmp/default.nix b/pkgs/development/libraries/libxmp/default.nix index 0b953f95d7e..31a14ff6ae4 100644 --- a/pkgs/development/libraries/libxmp/default.nix +++ b/pkgs/development/libraries/libxmp/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { Scream Tracker 3 (S3M), Fast Tracker II (XM), and Impulse Tracker (IT). ''; license = licenses.lgpl21Plus; - platforms = platforms.linux; + platforms = platforms.all; }; src = fetchurl { From 3389afa59676154b8f21b85cce75ad561bb30ae0 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Fri, 12 Mar 2021 12:20:04 +0700 Subject: [PATCH 19/33] loudmouth: expand platforms to all --- pkgs/development/libraries/loudmouth/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/loudmouth/default.nix b/pkgs/development/libraries/loudmouth/default.nix index 0245417bbf9..a8d9b23cc84 100644 --- a/pkgs/development/libraries/loudmouth/default.nix +++ b/pkgs/development/libraries/loudmouth/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A lightweight C library for the Jabber protocol"; - platforms = platforms.linux; + platforms = platforms.all; downloadPage = "http://mcabber.com/files/loudmouth/"; downloadURLRegexp = "loudmouth-[0-9.]+[.]tar[.]bz2$"; updateWalker = true; From 53afdd0c80799883dcea893c48aaeabde499a60c Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Fri, 12 Mar 2021 12:18:50 +0700 Subject: [PATCH 20/33] lrdf: expand platforms to unix --- pkgs/development/libraries/lrdf/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/lrdf/default.nix b/pkgs/development/libraries/lrdf/default.nix index 51b2635b89e..bd78a4329a5 100644 --- a/pkgs/development/libraries/lrdf/default.nix +++ b/pkgs/development/libraries/lrdf/default.nix @@ -31,6 +31,6 @@ stdenv.mkDerivation rec { homepage = "https://sourceforge.net/projects/lrdf/"; license = lib.licenses.gpl2; maintainers = [ lib.maintainers.marcweber ]; - platforms = lib.platforms.linux; + platforms = lib.platforms.unix; }; } From 597d1c65109a20b38c8221aa9a944ecb2e74b446 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Fri, 12 Mar 2021 12:24:31 +0700 Subject: [PATCH 21/33] metal: expand platforms to all --- pkgs/development/libraries/metal/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/metal/default.nix b/pkgs/development/libraries/metal/default.nix index b98ae8e217c..2f43485e05e 100644 --- a/pkgs/development/libraries/metal/default.nix +++ b/pkgs/development/libraries/metal/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/brunocodutra/metal"; license = licenses.mit; maintainers = with maintainers; [ pmiddend ]; - platforms = platforms.linux; + platforms = platforms.all; }; } From 24c065773b9b2f01f3576ef070536ef404b80c75 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Fri, 12 Mar 2021 12:22:41 +0700 Subject: [PATCH 22/33] minixml: expand platforms to all --- pkgs/development/libraries/minixml/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/minixml/default.nix b/pkgs/development/libraries/minixml/default.nix index 93c03b31a8a..9bf5235db82 100644 --- a/pkgs/development/libraries/minixml/default.nix +++ b/pkgs/development/libraries/minixml/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { description = "A small XML library"; homepage = "https://www.msweet.org/mxml/"; license = licenses.asl20; - platforms = platforms.linux; + platforms = platforms.all; maintainers = [ maintainers.goibhniu ]; }; } From 503d637bab85ef73ebc1a0d9c94ff9562437ecdf Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Fri, 12 Mar 2021 12:20:36 +0700 Subject: [PATCH 23/33] msgpuck: expand platforms to all --- pkgs/development/libraries/msgpuck/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/msgpuck/default.nix b/pkgs/development/libraries/msgpuck/default.nix index 53fb3bec908..cc7b056bb98 100644 --- a/pkgs/development/libraries/msgpuck/default.nix +++ b/pkgs/development/libraries/msgpuck/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { description = "A simple and efficient MsgPack binary serialization library in a self-contained header file"; homepage = "https://github.com/rtsisyk/msgpuck"; license = licenses.bsd2; - platforms = platforms.linux; + platforms = platforms.all; maintainers = with maintainers; [ izorkin ]; }; } From dca4490738d06e46ca20e96270804570d755be5e Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Fri, 12 Mar 2021 01:41:30 +0700 Subject: [PATCH 24/33] p8-platform: expand platforms to all --- pkgs/development/libraries/libcec/platform.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libcec/platform.nix b/pkgs/development/libraries/libcec/platform.nix index 15972272a18..61eccf1f40e 100644 --- a/pkgs/development/libraries/libcec/platform.nix +++ b/pkgs/development/libraries/libcec/platform.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { homepage = "https://github.com/Pulse-Eight/platform"; repositories.git = "https://github.com/Pulse-Eight/platform.git"; license = lib.licenses.gpl2Plus; - platforms = platforms.linux; + platforms = platforms.all; maintainers = [ maintainers.titanous ]; }; } From 5c9cb64b4362929e077c39112d8e17e413bad938 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Fri, 12 Mar 2021 12:23:08 +0700 Subject: [PATCH 25/33] pwndbg: expand platforms to all --- pkgs/development/tools/misc/pwndbg/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/misc/pwndbg/default.nix b/pkgs/development/tools/misc/pwndbg/default.nix index 69ed17ab4b9..764fa667734 100644 --- a/pkgs/development/tools/misc/pwndbg/default.nix +++ b/pkgs/development/tools/misc/pwndbg/default.nix @@ -46,7 +46,7 @@ in stdenv.mkDerivation rec { description = "Exploit Development and Reverse Engineering with GDB Made Easy"; homepage = "https://github.com/pwndbg/pwndbg"; license = licenses.mit; - platforms = platforms.linux; + platforms = platforms.all; maintainers = with maintainers; [ mic92 ]; }; } From 7c5efd446a7bf88791e99bf5c1f094405541daea Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Fri, 12 Mar 2021 12:23:42 +0700 Subject: [PATCH 26/33] pxlib: expand platforms to all --- pkgs/development/libraries/pxlib/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/pxlib/default.nix b/pkgs/development/libraries/pxlib/default.nix index 3acaf8bac15..4b6b9ada7ab 100644 --- a/pkgs/development/libraries/pxlib/default.nix +++ b/pkgs/development/libraries/pxlib/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { description = "Library to read and write Paradox files"; homepage = "http://pxlib.sourceforge.net/"; license = licenses.gpl2; - platforms = platforms.linux; + platforms = platforms.all; maintainers = [ maintainers.winpat ]; }; } From 413fbf5b9f43fc87be32361d6dcae0540533fcbb Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Fri, 12 Mar 2021 12:21:58 +0700 Subject: [PATCH 27/33] safefile: expand platforms to all --- pkgs/development/libraries/safefile/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/safefile/default.nix b/pkgs/development/libraries/safefile/default.nix index db18621d8e4..293a13dbddc 100644 --- a/pkgs/development/libraries/safefile/default.nix +++ b/pkgs/development/libraries/safefile/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { description = "File open routines to safely open a file when in the presence of an attack"; license = lib.licenses.asl20 ; maintainers = [lib.maintainers.raskin]; - platforms = lib.platforms.linux; + platforms = lib.platforms.all; homepage = "https://research.cs.wisc.edu/mist/safefile/"; updateWalker = true; }; From 5eeece814a50716a212f5c0c7be6938918956a2c Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Fri, 12 Mar 2021 13:03:18 +0700 Subject: [PATCH 28/33] shhmsg: fix darwin build --- pkgs/development/libraries/shhmsg/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/shhmsg/default.nix b/pkgs/development/libraries/shhmsg/default.nix index 0c736e4cb91..704df3dc5ef 100644 --- a/pkgs/development/libraries/shhmsg/default.nix +++ b/pkgs/development/libraries/shhmsg/default.nix @@ -8,13 +8,16 @@ stdenv.mkDerivation rec { sha256 = "0ax02fzqpaxr7d30l5xbndy1s5vgg1ag643c7zwiw2wj1czrxil8"; }; + postPatch = '' + substituteInPlace Makefile --replace "gcc" "${stdenv.cc.targetPrefix}cc" + ''; + installFlags = [ "INSTBASEDIR=$(out)" ]; meta = with lib; { description = "A library for displaying messages"; homepage = "https://shh.thathost.com/pub-unix/"; license = licenses.artistic1; - platforms = platforms.linux; + platforms = platforms.all; }; } - From 82a0379d9c954d3e27620277db9204916a040077 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Fri, 12 Mar 2021 13:03:03 +0700 Subject: [PATCH 29/33] shhopt: fix darwin build --- pkgs/development/libraries/shhopt/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/shhopt/default.nix b/pkgs/development/libraries/shhopt/default.nix index da1b820fcd5..0657b13e557 100644 --- a/pkgs/development/libraries/shhopt/default.nix +++ b/pkgs/development/libraries/shhopt/default.nix @@ -8,12 +8,16 @@ stdenv.mkDerivation rec { sha256 = "0yd6bl6qw675sxa81nxw6plhpjf9d2ywlm8a5z66zyjf28sl7sds"; }; + postPatch = '' + substituteInPlace Makefile --replace "gcc" "${stdenv.cc.targetPrefix}cc" + ''; + installFlags = [ "INSTBASEDIR=$(out)" ]; meta = with lib; { description = "A library for parsing command line options"; homepage = "https://shh.thathost.com/pub-unix/"; license = licenses.artistic1; - platforms = platforms.linux; + platforms = platforms.all; }; } From 73b93f6b9be3b12fe881409918f3ca6798d2ce6a Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Fri, 12 Mar 2021 12:22:10 +0700 Subject: [PATCH 30/33] spglib: expand platforms to all --- pkgs/development/libraries/spglib/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/spglib/default.nix b/pkgs/development/libraries/spglib/default.nix index 12d696b65a8..3d1236a03db 100644 --- a/pkgs/development/libraries/spglib/default.nix +++ b/pkgs/development/libraries/spglib/default.nix @@ -21,6 +21,6 @@ stdenv.mkDerivation rec { homepage = "https://atztogo.github.io/spglib/"; license = licenses.bsd3; maintainers = [ maintainers.markuskowa ]; - platforms = platforms.linux; + platforms = platforms.all; }; } From 87975ef4330be6536ae2caa6c85442db195bd89f Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Fri, 12 Mar 2021 12:22:20 +0700 Subject: [PATCH 31/33] spice-protocol: expand platforms to all --- pkgs/development/libraries/spice-protocol/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/spice-protocol/default.nix b/pkgs/development/libraries/spice-protocol/default.nix index 07b670a2718..1eaa3398e40 100644 --- a/pkgs/development/libraries/spice-protocol/default.nix +++ b/pkgs/development/libraries/spice-protocol/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation rec { homepage = "https://www.spice-space.org/"; license = licenses.bsd3; maintainers = with maintainers; [ bluescreen303 ]; - platforms = platforms.linux; + platforms = platforms.all; }; } From 773c4b840f0b9d35ede20ba9aa36c66613c4564d Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Fri, 12 Mar 2021 12:21:05 +0700 Subject: [PATCH 32/33] tidyp: expand platforms to all --- pkgs/development/libraries/tidyp/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/tidyp/default.nix b/pkgs/development/libraries/tidyp/default.nix index 5c0ad8463b4..f4c24a126e5 100644 --- a/pkgs/development/libraries/tidyp/default.nix +++ b/pkgs/development/libraries/tidyp/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A program that can validate your HTML, as well as modify it to be more clean and standard"; homepage = "http://tidyp.com/"; - platforms = platforms.linux; + platforms = platforms.all; maintainers = with maintainers; [ pSub ]; license = licenses.bsd3; }; From 9706a8d8d195390118a1ac7092471b6835a00869 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Fri, 12 Mar 2021 12:21:42 +0700 Subject: [PATCH 33/33] vassal: expand platforms to unix --- pkgs/games/vassal/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/games/vassal/default.nix b/pkgs/games/vassal/default.nix index 2a916094af4..cc9e9bd9856 100644 --- a/pkgs/games/vassal/default.nix +++ b/pkgs/games/vassal/default.nix @@ -31,6 +31,6 @@ stdenv.mkDerivation rec { homepage = "http://www.vassalengine.org/"; license = licenses.lgpl21Only; maintainers = with maintainers; [ tvestelind ]; - platforms = platforms.linux; + platforms = platforms.unix; }; }