Merge pull request #17685 from matthewbauer/darwin-misc2

Darwin misc. fixes

8 files changed, 26 insertions, 6 deletions

diff --git a/pkgs/applications/audio/bs1770gain/default.nix b/pkgs/applications/audio/bs1770gain/default.nix
index db6843f4535b..862f52636951 100644
--- a/pkgs/applications/audio/bs1770gain/default.nix
+++ b/pkgs/applications/audio/bs1770gain/default.nix
@@ -11,6 +11,8 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ ffmpeg sox ];
 
+  NIX_CFLAGS_COMPILE = "-Wno-error";
+
   meta = {
     description = "A audio/video loudness scanner implementing ITU-R BS.1770";
     license = stdenv.lib.licenses.gpl2Plus;
diff --git a/pkgs/applications/audio/cd-discid/default.nix b/pkgs/applications/audio/cd-discid/default.nix
index 5286362b50f5..2cf9849e351b 100644
--- a/pkgs/applications/audio/cd-discid/default.nix
+++ b/pkgs/applications/audio/cd-discid/default.nix
@@ -1,4 +1,5 @@
-{ fetchurl, stdenv }:
+{ fetchurl, stdenv
+, IOKit ? null }:
 
 stdenv.mkDerivation rec {
   name = "cd-discid-${version}";
@@ -11,6 +12,9 @@ stdenv.mkDerivation rec {
 
   installFlags = "PREFIX=$(out) INSTALL=install";
 
+  buildInputs = []
+    ++ stdenv.lib.optional stdenv.isDarwin [ IOKit ];
+
   meta = with stdenv.lib; {
     homepage = http://linukz.org/cd-discid.shtml;
     license = licenses.gpl2Plus;
diff --git a/pkgs/applications/editors/geany/default.nix b/pkgs/applications/editors/geany/default.nix
index cd93a4ed0e8f..961c7ba04619 100644
--- a/pkgs/applications/editors/geany/default.nix
+++ b/pkgs/applications/editors/geany/default.nix
@@ -12,6 +12,8 @@ stdenv.mkDerivation rec {
     sha256 = "0nha21rbdhl10vdpaq8d5v5fszvggl1xar555pvrnvm2y443ffpp";
   };
 
+  NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null;
+
   buildInputs = [ gtk2 which pkgconfig intltool file ];
 
   doCheck = true;
diff --git a/pkgs/applications/editors/mg/default.nix b/pkgs/applications/editors/mg/default.nix
index 45a527c7484e..95a6205125b0 100644
--- a/pkgs/applications/editors/mg/default.nix
+++ b/pkgs/applications/editors/mg/default.nix
@@ -12,6 +12,9 @@ stdenv.mkDerivation rec {
   patches = [ ./configure.patch ];
   patchFlags = "-p0";
 
+  NIX_CFLAGS_COMPILE = "-Wno-error";
+  buildFlags = [ "CC=cc" ];
+
   installPhase = ''
     mkdir -p $out/bin
     cp mg $out/bin
diff --git a/pkgs/applications/graphics/gpicview/default.nix b/pkgs/applications/graphics/gpicview/default.nix
index 4d01bbd126b3..7e11c9dea3a7 100644
--- a/pkgs/applications/graphics/gpicview/default.nix
+++ b/pkgs/applications/graphics/gpicview/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, intltool, pkgconfig, gtk2 }:
+{ stdenv, fetchurl, intltool, pkgconfig, gtk2, fetchpatch }:
 
 stdenv.mkDerivation {
   name = "gpicview-0.2.4";
@@ -8,6 +8,13 @@ stdenv.mkDerivation {
     sha256 = "1svcy1c8bgk0pl12yhyv16h2fl52x5vzzcv57z6qdcv5czgvgglr";
   };
 
+  patches = [
+    (fetchpatch {
+      url = "https://raw.githubusercontent.com/nonas/debian-clang/master/buildlogs/gpicview/gpicview-0.2.4/debian/patches/clang_FTBFS_Wreturn-type.patch";
+      sha256 = "02dm966bplnv10knpdx7rlpjipk884156ggd9ij05zhza0jl8xcs";
+    })
+  ];
+
   meta = with stdenv.lib; {
     description = "A simple and fast image viewer for X";
     homepage    = http://lxde.sourceforge.net/gpicview/;
diff --git a/pkgs/applications/misc/gkrellm/default.nix b/pkgs/applications/misc/gkrellm/default.nix
index ac8f876ad3fc..23b705058df1 100644
--- a/pkgs/applications/misc/gkrellm/default.nix
+++ b/pkgs/applications/misc/gkrellm/default.nix
@@ -1,4 +1,5 @@
-{ fetchurl, stdenv, gettext, pkgconfig, glib, gtk, libX11, libSM, libICE }:
+{ fetchurl, stdenv, gettext, pkgconfig, glib, gtk, libX11, libSM, libICE
+, IOKit ? null }:
 
 stdenv.mkDerivation rec {
   name = "gkrellm-2.3.5";
@@ -7,7 +8,8 @@ stdenv.mkDerivation rec {
     sha256 = "12rc6zaa7kb60b9744lbrlfkxxfniprm6x0mispv63h4kh75navh";
   };
 
-  buildInputs = [gettext pkgconfig glib gtk libX11 libSM libICE];
+  buildInputs = [gettext pkgconfig glib gtk libX11 libSM libICE]
+    ++ stdenv.lib.optionals stdenv.isDarwin [ IOKit ];
 
   # Makefiles are patched to fix references to `/usr/X11R6' and to add
   # `-lX11' to make sure libX11's store path is in the RPATH.
diff --git a/pkgs/applications/networking/nload/default.nix b/pkgs/applications/networking/nload/default.nix
index f3faa0128bb5..879461c8acd5 100644
--- a/pkgs/applications/networking/nload/default.nix
+++ b/pkgs/applications/networking/nload/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     '';
     homepage = http://www.roland-riegel.de/nload/index.html;
     license = stdenv.lib.licenses.gpl2;
-    platforms = stdenv.lib.platforms.unix;
+    platforms = stdenv.lib.platforms.linux;
     maintainers = [ stdenv.lib.maintainers.devhell ];
   };
 }
diff --git a/pkgs/applications/window-managers/i3/blocks-gaps.nix b/pkgs/applications/window-managers/i3/blocks-gaps.nix
index 36cf593a8904..a80dbd38ec8c 100644
--- a/pkgs/applications/window-managers/i3/blocks-gaps.nix
+++ b/pkgs/applications/window-managers/i3/blocks-gaps.nix
@@ -19,6 +19,6 @@ stdenv.mkDerivation rec {
     homepage = https://github.com/Airblader/i3blocks-gaps;
     license = licenses.gpl3;
     maintainers = [ "carlsverre" ];
-    platforms = platforms.all;
+    platforms = platforms.linux;
   };
 }