From 6edd82d02c8cbda4d6c4a3532af26841a8863f5f Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Fri, 4 Jan 2019 19:33:49 +0000
Subject: [PATCH 01/55] a2jmidid: fix pthread linkage

---
 pkgs/applications/audio/a2jmidid/default.nix | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/audio/a2jmidid/default.nix b/pkgs/applications/audio/a2jmidid/default.nix
index f443aec43dd..70709ae4ac4 100644
--- a/pkgs/applications/audio/a2jmidid/default.nix
+++ b/pkgs/applications/audio/a2jmidid/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, makeWrapper, pkgconfig, alsaLib, dbus, libjack2
+{ stdenv, fetchurl, fetchpatch, makeWrapper, pkgconfig, alsaLib, dbus, libjack2
 , wafHook
 , python2Packages}:
 
@@ -16,6 +16,17 @@ in stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig makeWrapper wafHook ];
   buildInputs = [ alsaLib dbus libjack2 python dbus-python ];
 
+  patches = [
+    (fetchpatch {
+      url = https://repo.or.cz/a2jmidid.git/patch/24e3b8e543256ae8fdfb4b75eb9fd775f07c46e2;
+      sha256 = "1nxrvnhxlgqc9wbxnp1gnpw4wjyzxvymwcg1gh2nqzmssgfykfkc";
+    })
+    (fetchpatch {
+      url = https://repo.or.cz/a2jmidid.git/patch/7f82da7eb2f540a94db23331be98d42a58ddc269;
+      sha256 = "1nab9zf0agbcj5pvhl90pz0cx1d204d4janqflc5ymjhy8jyrsdv";
+    })
+  ];
+
   postInstall = ''
     wrapProgram $out/bin/a2j_control --set PYTHONPATH $PYTHONPATH
   '';

From 4bdf36d1560d722b13f0a90aeacdc6afe71d9c68 Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Fri, 4 Jan 2019 19:33:49 +0000
Subject: [PATCH 02/55] aegisub: link with pthread explicitly

---
 pkgs/applications/video/aegisub/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/applications/video/aegisub/default.nix b/pkgs/applications/video/aegisub/default.nix
index 3dd0cc5adc2..d4208aee62e 100644
--- a/pkgs/applications/video/aegisub/default.nix
+++ b/pkgs/applications/video/aegisub/default.nix
@@ -48,6 +48,12 @@ stdenv.mkDerivation rec {
 
   hardeningDisable = [ "bindnow" "relro" ];
 
+  # this is fixed upstream though not yet in an officially released version,
+  # should be fine remove on next release (if one ever happens)
+  NIX_LDFLAGS = [
+    "-lpthread"
+  ];
+
   postInstall = "ln -s $out/bin/aegisub-* $out/bin/aegisub";
 
   meta = {

From e7040637e5ea16a61523b2187f56e1b40d32fec8 Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Fri, 4 Jan 2019 19:33:49 +0000
Subject: [PATCH 03/55] ahoviewer: link with pthread explicitly

---
 pkgs/applications/graphics/ahoviewer/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/applications/graphics/ahoviewer/default.nix b/pkgs/applications/graphics/ahoviewer/default.nix
index 52df41c683c..6668bc42a8b 100644
--- a/pkgs/applications/graphics/ahoviewer/default.nix
+++ b/pkgs/applications/graphics/ahoviewer/default.nix
@@ -29,6 +29,10 @@ stdenv.mkDerivation rec {
     gst_all_1.gst-plugins-base
   ] ++ stdenv.lib.optional useUnrar unrar;
 
+  NIX_LDFLAGS = [
+    "-lpthread"
+  ];
+
   postPatch = ''patchShebangs version.sh'';
 
   postInstall = ''

From 517f2d392ee66f9237c553ef795aff8cf650d32c Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Fri, 4 Jan 2019 19:33:50 +0000
Subject: [PATCH 04/55] airstrike: link with libm explicitly

---
 pkgs/games/airstrike/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/games/airstrike/default.nix b/pkgs/games/airstrike/default.nix
index a0bbd3b1c67..02ea6f68806 100644
--- a/pkgs/games/airstrike/default.nix
+++ b/pkgs/games/airstrike/default.nix
@@ -11,6 +11,10 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ makeWrapper SDL SDL_image ];
 
+  NIX_LDFLAGS = [
+    "-lm"
+  ];
+
   installPhase = ''
     ls -l
     mkdir -p $out/bin

From d17273394bcbd8dc9e496877001aacd234c16181 Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Fri, 4 Jan 2019 19:33:50 +0000
Subject: [PATCH 05/55] dbus_cplusplus: disable tests

They fail to build.
---
 pkgs/development/libraries/dbus-cplusplus/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/dbus-cplusplus/default.nix b/pkgs/development/libraries/dbus-cplusplus/default.nix
index 6190f6ddc52..163b0f4be88 100644
--- a/pkgs/development/libraries/dbus-cplusplus/default.nix
+++ b/pkgs/development/libraries/dbus-cplusplus/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ dbus glib expat ];
 
-  configureFlags = [ "--disable-ecore" ];
+  configureFlags = [ "--disable-ecore" "--disable-tests" ];
 
   meta = with stdenv.lib; {
     homepage = http://dbus-cplusplus.sourceforge.net;

From 6b0d3da79f46a127150f920f089157498a415f24 Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Fri, 4 Jan 2019 19:33:50 +0000
Subject: [PATCH 06/55] a52dec: build shared libraries

---
 pkgs/development/libraries/a52dec/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/libraries/a52dec/default.nix b/pkgs/development/libraries/a52dec/default.nix
index ef1307c9711..5ff5e609723 100644
--- a/pkgs/development/libraries/a52dec/default.nix
+++ b/pkgs/development/libraries/a52dec/default.nix
@@ -8,6 +8,10 @@ stdenv.mkDerivation rec {
     sha256 = "0czccp4fcpf2ykp16xcrzdfmnircz1ynhls334q374xknd5747d2";
   };
 
+  configureFlags = [
+    "--enable-shared"
+  ];
+
   # fails 1 out of 1 tests with "BAD GLOBAL SYMBOLS" on i686
   # which can also be fixed with
   # hardeningDisable = stdenv.lib.optional stdenv.isi686 "pic";

From 9e551aee94426498dfecbc0e5f26504009667778 Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Fri, 4 Jan 2019 19:33:50 +0000
Subject: [PATCH 07/55] artha: fix libgio-2.0 underlinking

---
 pkgs/applications/misc/artha/default.nix         |  8 ++++++--
 pkgs/applications/misc/artha/gio-underlink.patch | 13 +++++++++++++
 2 files changed, 19 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/applications/misc/artha/gio-underlink.patch

diff --git a/pkgs/applications/misc/artha/default.nix b/pkgs/applications/misc/artha/default.nix
index f69152820e4..202c1669f85 100644
--- a/pkgs/applications/misc/artha/default.nix
+++ b/pkgs/applications/misc/artha/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, dbus-glib, gtk2, pkgconfig, wordnet }:
+{ stdenv, autoreconfHook, fetchurl, dbus-glib, gtk2, pkgconfig, wordnet }:
 
 stdenv.mkDerivation rec {
   name = "artha-${version}";
@@ -9,9 +9,13 @@ stdenv.mkDerivation rec {
     sha256 = "0qr4ihl7ma3cq82xi1fpzvf74mm9vsg0j035xvmcp3r6rmw2fycx";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ autoreconfHook pkgconfig ];
   buildInputs = [ dbus-glib gtk2 wordnet ];
 
+  patches = [
+    ./gio-underlink.patch
+  ];
+
   meta = with stdenv.lib; {
     description = "An offline thesaurus based on WordNet";
     homepage = http://artha.sourceforge.net;
diff --git a/pkgs/applications/misc/artha/gio-underlink.patch b/pkgs/applications/misc/artha/gio-underlink.patch
new file mode 100644
index 00000000000..08d9c478736
--- /dev/null
+++ b/pkgs/applications/misc/artha/gio-underlink.patch
@@ -0,0 +1,13 @@
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 0236d72..bcc1182 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -38,7 +38,7 @@ artha_LDADD = libwni.a $(WORDNET_LIB)
+ 
+ if POSIX
+ AM_CFLAGS += @libdbus_CFLAGS@
+-artha_LDADD += -lX11 -ldbus-1 -ldbus-glib-1 -lgtk-x11-2.0 \
++artha_LDADD += -lX11 -ldbus-1 -ldbus-glib-1 -lgio-2.0 -lgtk-x11-2.0 \
+ 		-lgdk-x11-2.0 -lgmodule-2.0 -lgobject-2.0 -lglib-2.0
+ else
+ artha_LDADD += @GTK_LIBS@

From 8fe36d7285824606573d286849acc90a3ea874d0 Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Fri, 4 Jan 2019 19:33:50 +0000
Subject: [PATCH 08/55] autopanosiftc: fix libm underlinking

---
 pkgs/applications/graphics/autopanosiftc/default.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/applications/graphics/autopanosiftc/default.nix b/pkgs/applications/graphics/autopanosiftc/default.nix
index 5fd1810bc28..c64604975ab 100644
--- a/pkgs/applications/graphics/autopanosiftc/default.nix
+++ b/pkgs/applications/graphics/autopanosiftc/default.nix
@@ -10,6 +10,13 @@ stdenv.mkDerivation {
 
   buildInputs = [ cmake libpng libtiff libjpeg panotools libxml2 ];
 
+  patches = [
+    (fetchurl {
+      url = https://gitweb.gentoo.org/repo/gentoo.git/plain/media-gfx/autopano-sift-C/files/autopano-sift-C-2.5.1-lm.patch;
+      sha256 = "1bfcr5sps0ip9gl4jprji5jgf9wkczz6d2clsjjlbsy8r3ixi3lv";
+    })
+  ];
+
   meta = {
     homepage = http://hugin.sourceforge.net/;
     description = "Implementation in C of the autopano-sift algorithm for automatically stitching panoramas";

From ae7557c4cb1d8ef0652da9352c31aad7d90c61fc Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Fri, 4 Jan 2019 19:33:50 +0000
Subject: [PATCH 09/55] avogadro: fix libX11 underlinking

---
 pkgs/applications/science/chemistry/avogadro/default.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/applications/science/chemistry/avogadro/default.nix b/pkgs/applications/science/chemistry/avogadro/default.nix
index 78cda9d115c..a569b82ff59 100644
--- a/pkgs/applications/science/chemistry/avogadro/default.nix
+++ b/pkgs/applications/science/chemistry/avogadro/default.nix
@@ -14,6 +14,13 @@ stdenv.mkDerivation rec {
 
   NIX_CFLAGS_COMPILE = "-include ${libGLU_combined}/include/GL/glu.h";
 
+  patches = [
+    (fetchurl {
+      url = https://data.gpo.zugaina.org/fusion809/sci-chemistry/avogadro/files/avogadro-1.1.0-xlibs.patch;
+      sha256 = "1p113v19z3zwr9gxj2k599f8p97a8rwm93pa4amqvd0snn31mw0k";
+    })
+  ];
+
   meta = {
     description = "Molecule editor and visualizer";
     maintainers = [ ];

From 0b0430928b7fd12e36239ad6c8e0a5681e0a44fc Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Fri, 4 Jan 2019 19:33:50 +0000
Subject: [PATCH 10/55] bitmeter: fix libm underlinking

---
 pkgs/applications/audio/bitmeter/default.nix | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/bitmeter/default.nix b/pkgs/applications/audio/bitmeter/default.nix
index 5f3229dc157..fbe2c97042f 100644
--- a/pkgs/applications/audio/bitmeter/default.nix
+++ b/pkgs/applications/audio/bitmeter/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libjack2, gtk2, pkgconfig }:
+{ stdenv, autoreconfHook, fetchurl, libjack2, gtk2, pkgconfig }:
 
 stdenv.mkDerivation rec {
   name = "bitmeter-${version}";
@@ -9,9 +9,16 @@ stdenv.mkDerivation rec {
     sha256 = "09ck2gxqky701dc1p0ip61rrn16v0pdc7ih2hc2sd63zcw53g2a7";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ autoreconfHook pkgconfig ];
   buildInputs = [ libjack2 gtk2 ];
 
+  patches = [
+    (fetchurl {
+      url = https://gitweb.gentoo.org/repo/gentoo.git/plain/media-sound/bitmeter/files/bitmeter-1.2-fix-build-system.patch;
+      sha256 = "021mz6933iw7mpk6b9cbjr8naj6smbq1hwqjszlyx72qbwrrid7k";
+    })
+  ];
+
   meta = with stdenv.lib; {
     homepage = http://devel.tlrmx.org/audio/bitmeter/;
     description = "Also known as jack bitscope. Useful to detect denormals";

From 580125f6fc88e39276688e035602cd3674f456a7 Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Fri, 4 Jan 2019 19:33:50 +0000
Subject: [PATCH 11/55] box2d: don't build examples

They fail to build and aren't included in the output anyway.
---
 pkgs/development/libraries/box2d/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/box2d/default.nix b/pkgs/development/libraries/box2d/default.nix
index e65980be320..a6ab33d20f7 100644
--- a/pkgs/development/libraries/box2d/default.nix
+++ b/pkgs/development/libraries/box2d/default.nix
@@ -17,7 +17,11 @@ stdenv.mkDerivation rec {
     unzip cmake libGLU_combined freeglut libX11 xproto inputproto libXi
   ];
 
-  cmakeFlags = [ "-DBOX2D_INSTALL=ON" "-DBOX2D_BUILD_SHARED=ON" ];
+  cmakeFlags = [
+    "-DBOX2D_INSTALL=ON"
+    "-DBOX2D_BUILD_SHARED=ON"
+    "-DBOX2D_BUILD_EXAMPLES=OFF"
+  ];
 
   prePatch = ''
     substituteInPlace Box2D/Common/b2Settings.h \

From b137a4c9502d2aa708bb5801f9ad60f688426b2d Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Fri, 4 Jan 2019 19:33:50 +0000
Subject: [PATCH 12/55] buddy: link with libm explicitly

---
 pkgs/development/libraries/buddy/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/libraries/buddy/default.nix b/pkgs/development/libraries/buddy/default.nix
index a8555a349d0..fb25b0a5810 100644
--- a/pkgs/development/libraries/buddy/default.nix
+++ b/pkgs/development/libraries/buddy/default.nix
@@ -11,6 +11,9 @@ stdenv.mkDerivation rec {
   buildInputs = [ bison ];
   patches = [ ./gcc-4.3.3-fixes.patch ];
   configureFlags = [ "CFLAGS=-O3" "CXXFLAGS=-O3" ];
+  NIX_LDFLAGS = [
+    "-lm"
+  ];
   doCheck = true;
 
   meta = {

From e828ad6ad957833dd206deb6af6ddd50709dc8f4 Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Fri, 4 Jan 2019 19:33:50 +0000
Subject: [PATCH 13/55] cinepaint: link with lib{m,png} explicitly

---
 pkgs/applications/graphics/cinepaint/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/graphics/cinepaint/default.nix b/pkgs/applications/graphics/cinepaint/default.nix
index 9c736f5ffb5..14c7bb1be61 100644
--- a/pkgs/applications/graphics/cinepaint/default.nix
+++ b/pkgs/applications/graphics/cinepaint/default.nix
@@ -26,7 +26,7 @@ in stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake pkgconfig ];
 
-  NIX_LDFLAGS = "-llcms -ljpeg -lX11";
+  NIX_LDFLAGS = "-lm -llcms -ljpeg -lpng -lX11";
 
   meta = {
     homepage = http://www.cinepaint.org/;

From ef5baf894c0fbb5d7fb1d83ef30ee545e3ce2645 Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Fri, 4 Jan 2019 19:33:50 +0000
Subject: [PATCH 14/55] cwiid: link with libbluetooth explicitly

---
 pkgs/development/libraries/cwiid/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/libraries/cwiid/default.nix b/pkgs/development/libraries/cwiid/default.nix
index ee646b24c81..246dd009820 100644
--- a/pkgs/development/libraries/cwiid/default.nix
+++ b/pkgs/development/libraries/cwiid/default.nix
@@ -23,6 +23,10 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
 
+  NIX_LDFLAGS = [
+    "-lbluetooth"
+  ];
+
   postInstall = ''
     # Some programs (for example, cabal-install) have problems with the double 0
     sed -i -e "s/0.6.00/0.6.0/" $out/lib/pkgconfig/cwiid.pc

From 4510ad1807f4644619693d76c89dbda61e3cbeec Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Fri, 4 Jan 2019 19:33:50 +0000
Subject: [PATCH 15/55] dsniff: link with pthreads explicitly

---
 pkgs/tools/networking/dsniff/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/networking/dsniff/default.nix b/pkgs/tools/networking/dsniff/default.nix
index 41acb533a3d..50a3c98af0f 100644
--- a/pkgs/tools/networking/dsniff/default.nix
+++ b/pkgs/tools/networking/dsniff/default.nix
@@ -54,7 +54,7 @@ in stdenv.mkDerivation {
 
   nativeBuildInputs = [ autoreconfHook ];
   buildInputs = [ glib pcap ];
-  NIX_CFLAGS_LINK = "-lglib-2.0";
+  NIX_CFLAGS_LINK = "-lglib-2.0 -lpthread";
   postPatch = ''
     for patch in debian/patches/*.patch; do
       patch < $patch

From 19d339ce3a16940766ae10597177608186c15c08 Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Fri, 4 Jan 2019 19:33:50 +0000
Subject: [PATCH 16/55] eboard: link with libdl explicitly

---
 pkgs/games/eboard/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/games/eboard/default.nix b/pkgs/games/eboard/default.nix
index bed3abccf9b..206ed02e69c 100644
--- a/pkgs/games/eboard/default.nix
+++ b/pkgs/games/eboard/default.nix
@@ -21,6 +21,10 @@ stdenv.mkDerivation {
 
   NIX_CFLAGS_COMPILE = [ "-fpermissive" ];
 
+  NIX_LDFLAGS = [
+    "-ldl"
+  ];
+
   meta = {
     homepage = http://www.bergo.eng.br/eboard/;
     description = "Chess interface for Unix-like systems";

From 69981de277684b1f2ab8e8bccead14f0b6187ff1 Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Fri, 4 Jan 2019 19:33:50 +0000
Subject: [PATCH 17/55] egoboo: link with libm explicitly

---
 pkgs/games/egoboo/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/games/egoboo/default.nix b/pkgs/games/egoboo/default.nix
index 29ad352c316..98ab4d27d5f 100644
--- a/pkgs/games/egoboo/default.nix
+++ b/pkgs/games/egoboo/default.nix
@@ -44,6 +44,10 @@ stdenv.mkDerivation rec {
     '';
   */
 
+  NIX_LDFLAGS = [
+    "-lm"
+  ];
+
   meta = {
     description = "3D dungeon crawling adventure";
 

From 12c733c292ae04deb1927d628479db71ce84e1be Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Fri, 4 Jan 2019 19:33:50 +0000
Subject: [PATCH 18/55] fileshelter: link with pthreads explicitly

---
 pkgs/servers/web-apps/fileshelter/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/servers/web-apps/fileshelter/default.nix b/pkgs/servers/web-apps/fileshelter/default.nix
index 01fb8c62482..d7510e7d1e0 100644
--- a/pkgs/servers/web-apps/fileshelter/default.nix
+++ b/pkgs/servers/web-apps/fileshelter/default.nix
@@ -16,6 +16,10 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
   buildInputs = [ libzip boost wt3 libconfig ];
 
+  NIX_LDFLAGS = [
+    "-lpthread"
+  ];
+
   postInstall = ''
     ln -s ${wt3}/share/Wt/resources $out/share/fileshelter/docroot/resources
   '';

From 6910266b0173e5ac8cccc0a5932483596abfa2c2 Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Fri, 4 Jan 2019 19:33:50 +0000
Subject: [PATCH 19/55] flatpak: link with pthreads explicitly

---
 pkgs/development/libraries/flatpak/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/libraries/flatpak/default.nix b/pkgs/development/libraries/flatpak/default.nix
index 39ff7468169..1b5facbc0d0 100644
--- a/pkgs/development/libraries/flatpak/default.nix
+++ b/pkgs/development/libraries/flatpak/default.nix
@@ -45,6 +45,10 @@ stdenv.mkDerivation rec {
 
   doCheck = false; # TODO: some issues with temporary files
 
+  NIX_LDFLAGS = [
+    "-lpthread"
+  ];
+
   enableParallelBuilding = true;
 
   configureFlags = [

From 2fe11f12fb551385875385bf98707316019228f4 Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Fri, 4 Jan 2019 19:33:50 +0000
Subject: [PATCH 20/55] gdmap: link with libm explicitly

---
 pkgs/tools/system/gdmap/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/tools/system/gdmap/default.nix b/pkgs/tools/system/gdmap/default.nix
index 72938216b0a..0c254bb2854 100644
--- a/pkgs/tools/system/gdmap/default.nix
+++ b/pkgs/tools/system/gdmap/default.nix
@@ -15,6 +15,10 @@ stdenv.mkDerivation rec {
 
   hardeningDisable = [ "format" ];
 
+  NIX_LDFLAGS = [
+    "-lm"
+  ];
+
   meta = with stdenv.lib; {
     homepage = http://gdmap.sourceforge.net;
     description = "Recursive rectangle map of disk usage";

From 4477dedfba4ed7f1d396a094513f74e1d4c57c16 Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Fri, 4 Jan 2019 19:33:50 +0000
Subject: [PATCH 21/55] gitAndTools.svn-all-fast-export: link with libsvn_fs-1
 explicitly

---
 .../git-and-tools/svn-all-fast-export/default.nix             | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix b/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix
index 35c6d33d74d..0ee188cc19d 100644
--- a/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix
@@ -22,6 +22,10 @@ stdenv.mkDerivation {
     "SVN_INCLUDE=${subversion.dev}/include/subversion-1"
   ];
 
+  NIX_LDFLAGS = [
+    "-lsvn_fs-1"
+  ];
+
   meta = with stdenv.lib; {
     homepage = https://github.com/svn-all-fast-export/svn2git;
     description = "A fast-import based converter for an svn repo to git repos";

From 77b88afa3087d90692485f1ccc38665047409412 Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Fri, 4 Jan 2019 19:33:50 +0000
Subject: [PATCH 22/55] globulation2: link with libboost_system explicitly

---
 pkgs/games/globulation/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/games/globulation/default.nix b/pkgs/games/globulation/default.nix
index 0c3b184b495..a539b79339f 100644
--- a/pkgs/games/globulation/default.nix
+++ b/pkgs/games/globulation/default.nix
@@ -41,6 +41,10 @@ stdenv.mkDerivation rec {
     sconsFlags+=" DATADIR=$out/share/globulation2/glob2"
   '';
 
+  NIX_LDFLAGS = [
+    "-lboost_system"
+  ];
+
   meta = with stdenv.lib; {
     description = "RTS without micromanagement";
     maintainers = with maintainers; [ raskin ];

From 3b49822b3d2c5cb58a975dcdf7033021fe18f168 Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Fri, 4 Jan 2019 19:33:50 +0000
Subject: [PATCH 23/55] gnujump: link with libm explicitly

---
 pkgs/games/gnujump/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/games/gnujump/default.nix b/pkgs/games/gnujump/default.nix
index ae2cbd81841..d4cbb04f39b 100644
--- a/pkgs/games/gnujump/default.nix
+++ b/pkgs/games/gnujump/default.nix
@@ -9,6 +9,10 @@ stdenv.mkDerivation rec {
   };
   buildInputs = [ SDL SDL_image SDL_mixer ];
 
+  NIX_LDFLAGS = [
+    "-lm"
+  ];
+
   meta = with stdenv.lib; {
     homepage = "https://jump.gnu.sinusoid.es/";
     description = "A clone of the simple yet addictive game Xjump";

From 8c83c4585e0d2430751039680afa165015f7ba24 Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Fri, 4 Jan 2019 19:33:50 +0000
Subject: [PATCH 24/55] gnuradio: link with pthreads explicitly

---
 pkgs/applications/misc/gnuradio/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/applications/misc/gnuradio/default.nix b/pkgs/applications/misc/gnuradio/default.nix
index a7c00cceaa7..f9a50313c47 100644
--- a/pkgs/applications/misc/gnuradio/default.nix
+++ b/pkgs/applications/misc/gnuradio/default.nix
@@ -50,6 +50,10 @@ stdenv.mkDerivation rec {
     Mako cheetah numpy scipy matplotlib pyqt4 pygtk wxPython pyopengl
   ];
 
+  NIX_LDFLAGS = [
+    "-lpthread"
+  ];
+
   enableParallelBuilding = true;
 
   postPatch = ''

From 12ac71cacafff77df2de985cd9d9dacff68d1971 Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Fri, 4 Jan 2019 19:33:50 +0000
Subject: [PATCH 25/55] golden-cheetah: link with libz explicitly

---
 pkgs/applications/misc/golden-cheetah/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/applications/misc/golden-cheetah/default.nix b/pkgs/applications/misc/golden-cheetah/default.nix
index 01447281fe7..edf16f806a6 100644
--- a/pkgs/applications/misc/golden-cheetah/default.nix
+++ b/pkgs/applications/misc/golden-cheetah/default.nix
@@ -26,6 +26,9 @@ in stdenv.mkDerivation rec {
     qtconnectivity
   ];
   nativeBuildInputs = [ flex makeWrapper qmake yacc ];
+  NIX_LDFLAGS = [
+    "-lz"
+  ];
   preConfigure = ''
     cp src/gcconfig.pri.in src/gcconfig.pri
     cp qwt/qwtconfig.pri.in qwt/qwtconfig.pri

From 71f216b7e68d635dfca2ee0c06316a77e3abb4cc Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Fri, 4 Jan 2019 19:33:50 +0000
Subject: [PATCH 26/55] golly-beta: link with lib{dl,GL} explicitly

---
 pkgs/applications/science/misc/golly/beta.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/science/misc/golly/beta.nix b/pkgs/applications/science/misc/golly/beta.nix
index 83b9c5a04a1..ebc476d3c6d 100644
--- a/pkgs/applications/science/misc/golly/beta.nix
+++ b/pkgs/applications/science/misc/golly/beta.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
   makeFlags=[
     "AM_LDFLAGS="
   ];
-  NIX_LDFLAGS="-lpython${python2.majorVersion} -lperl";
+  NIX_LDFLAGS="-lpython${python2.majorVersion} -lperl -ldl -lGL";
   preConfigure=''
     export NIX_LDFLAGS="$NIX_LDFLAGS -L$(dirname "$(find ${perl} -name libperl.so)")"
     export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE

From 418a2d771c26b159faa562a01f01d9ada86c0007 Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Fri, 4 Jan 2019 19:33:50 +0000
Subject: [PATCH 27/55] goxel: link with pthreads explicitly

---
 pkgs/applications/graphics/goxel/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/applications/graphics/goxel/default.nix b/pkgs/applications/graphics/goxel/default.nix
index 27dd37d1803..9a2da84cfb9 100644
--- a/pkgs/applications/graphics/goxel/default.nix
+++ b/pkgs/applications/graphics/goxel/default.nix
@@ -16,6 +16,9 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ scons pkgconfig wrapGAppsHook ];
   buildInputs = [ glfw3 gtk3 libpng12 ];
+  NIX_LDFLAGS = [
+    "-lpthread"
+  ];
 
   buildPhase = ''
     make release

From 3d94f68c754272538cc9cd523997aa181ed88e1a Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Fri, 4 Jan 2019 19:33:50 +0000
Subject: [PATCH 28/55] gqview: link with libm explicitly

---
 pkgs/applications/graphics/gqview/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/applications/graphics/gqview/default.nix b/pkgs/applications/graphics/gqview/default.nix
index 75140bd005d..205376b1257 100644
--- a/pkgs/applications/graphics/gqview/default.nix
+++ b/pkgs/applications/graphics/gqview/default.nix
@@ -18,6 +18,10 @@ stdenv.mkDerivation {
 
   hardeningDisable = [ "format" ];
 
+  NIX_LDFLAGS = [
+    "-lm"
+  ];
+
   meta = with stdenv.lib; {
     description = "A fast image viewer";
     homepage = http://gqview.sourceforge.net;

From 46fad2b3b8edab36967d13e00555e196d9fc2d9d Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Fri, 4 Jan 2019 19:33:50 +0000
Subject: [PATCH 29/55] gtk-server: link with libdl explicitly

---
 pkgs/development/interpreters/gtk-server/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/interpreters/gtk-server/default.nix b/pkgs/development/interpreters/gtk-server/default.nix
index ab295dab444..6f5a5ec0f19 100644
--- a/pkgs/development/interpreters/gtk-server/default.nix
+++ b/pkgs/development/interpreters/gtk-server/default.nix
@@ -14,6 +14,10 @@ stdenv.mkDerivation rec {
 
   configureOptions = [ "--with-gtk2" ];
 
+  NIX_LDFLAGS = [
+    "-ldl"
+  ];
+
   meta = {
     description = "gtk-server for interpreted GUI programming";
     homepage = http://www.gtk-server.org/;

From 0d8bec14f040ddc2bf1db43ec57bca2ad7fb9856 Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Fri, 4 Jan 2019 19:33:50 +0000
Subject: [PATCH 30/55] jack_rack: link with pthreads, lib{dl,m} explicitly

---
 pkgs/applications/audio/jack-rack/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/applications/audio/jack-rack/default.nix b/pkgs/applications/audio/jack-rack/default.nix
index d68e67d19dd..26a717dbd6e 100644
--- a/pkgs/applications/audio/jack-rack/default.nix
+++ b/pkgs/applications/audio/jack-rack/default.nix
@@ -7,6 +7,11 @@ stdenv.mkDerivation rec {
   };
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ libjack2 ladspaH gtk2 alsaLib libxml2 librdf ];
+  NIX_LDFLAGS = [
+    "-ldl"
+    "-lm"
+    "-lpthread"
+  ];
 
   meta = {
     description = ''An effects "rack" for the JACK low latency audio API'';

From 472c14af6023a2f9b18f8980e2ec60f940526712 Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Fri, 4 Jan 2019 19:33:50 +0000
Subject: [PATCH 31/55] k2pdfopt: link with pthreads explicitly

---
 pkgs/applications/misc/k2pdfopt/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/applications/misc/k2pdfopt/default.nix b/pkgs/applications/misc/k2pdfopt/default.nix
index 8f69abd3a98..2a3b2e61fc2 100644
--- a/pkgs/applications/misc/k2pdfopt/default.nix
+++ b/pkgs/applications/misc/k2pdfopt/default.nix
@@ -104,6 +104,10 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = [ "-DCMAKE_C_FLAGS=-I${src}/include_mod" ];
 
+  NIX_LDFLAGS = [
+    "-lpthread"
+  ];
+
   installPhase = ''
     install -D -m 755 k2pdfopt $out/bin/k2pdfopt
   '';

From d02a1bb2ab8c68f5d421f434ed141381bc0c0083 Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Fri, 4 Jan 2019 19:33:50 +0000
Subject: [PATCH 32/55] kino: link with lib{avcodec,avutil} explicitly

---
 pkgs/applications/video/kino/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/applications/video/kino/default.nix b/pkgs/applications/video/kino/default.nix
index d6404a82bc3..4ddd84433e8 100644
--- a/pkgs/applications/video/kino/default.nix
+++ b/pkgs/applications/video/kino/default.nix
@@ -71,6 +71,11 @@ stdenv.mkDerivation {
 
   hardeningDisable = [ "format" ];
 
+  NIX_LDFLAGS = [
+    "-lavcodec"
+    "-lavutil"
+  ];
+
   patches = [ ./kino-1.3.4-v4l1.patch ./kino-1.3.4-libav-0.7.patch ./kino-1.3.4-libav-0.8.patch ]; #./kino-1.3.4-libavcodec-pkg-config.patch ];
 
   postInstall = "

From 46dd3e27d961dd48e68164e1f27fd3af2a001d57 Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Fri, 4 Jan 2019 19:33:50 +0000
Subject: [PATCH 33/55] lash: link with pthreads, lib{uuid,m} explicitly

---
 pkgs/applications/audio/lash/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/applications/audio/lash/default.nix b/pkgs/applications/audio/lash/default.nix
index 9d295073597..7fb5a01e2c8 100644
--- a/pkgs/applications/audio/lash/default.nix
+++ b/pkgs/applications/audio/lash/default.nix
@@ -18,6 +18,11 @@ stdenv.mkDerivation  rec {
   buildInputs = [ alsaLib gtk2 libjack2 libxml2 makeWrapper
     pkgconfig readline ];
   propagatedBuildInputs = [ libuuid ];
+  NIX_LDFLAGS = [
+    "-lm"
+    "-lpthread"
+    "-luuid"
+  ];
 
   postInstall = ''
     for i in lash_control lash_panel

From 3de83a8004c76631ad6fa4831960192b28ace58e Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Fri, 4 Jan 2019 19:33:50 +0000
Subject: [PATCH 34/55] libfakekey: link with libX11 explicitly

---
 pkgs/development/libraries/libfakekey/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/libraries/libfakekey/default.nix b/pkgs/development/libraries/libfakekey/default.nix
index fa04655341d..2a8e461d27e 100644
--- a/pkgs/development/libraries/libfakekey/default.nix
+++ b/pkgs/development/libraries/libfakekey/default.nix
@@ -11,6 +11,9 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ libX11 libXi libXtst xextproto ];
+  NIX_LDFLAGS = [
+    "-lX11"
+  ];
 
   meta = with stdenv.lib; {
     description = "X virtual keyboard library";

From a830472b0bc7babe6c08392f99d5404697b6f200 Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Fri, 4 Jan 2019 19:33:50 +0000
Subject: [PATCH 35/55] libmatchbox: link with libX11 explicitly

---
 pkgs/development/libraries/libmatchbox/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/libraries/libmatchbox/default.nix b/pkgs/development/libraries/libmatchbox/default.nix
index 798aef8e7da..8ff02b49e58 100644
--- a/pkgs/development/libraries/libmatchbox/default.nix
+++ b/pkgs/development/libraries/libmatchbox/default.nix
@@ -6,6 +6,9 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ libXft libICE pango libjpeg ];
   propagatedBuildInputs = [ libX11 libXext libpng ];
+  NIX_LDFLAGS = [
+    "-lX11"
+  ];
 
   src = fetchurl {
     url = "https://downloads.yoctoproject.org/releases/matchbox/libmatchbox/${version}/libmatchbox-${version}.tar.bz2";

From ff1fc5a19903a7ad92c6698d290ffada1c02e429 Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Fri, 4 Jan 2019 19:33:50 +0000
Subject: [PATCH 36/55] multitran.libmtquery: link with libbtree explicitly

---
 pkgs/tools/text/multitran/libmtquery/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/tools/text/multitran/libmtquery/default.nix b/pkgs/tools/text/multitran/libmtquery/default.nix
index 153184bf70f..8b2032dcaba 100644
--- a/pkgs/tools/text/multitran/libmtquery/default.nix
+++ b/pkgs/tools/text/multitran/libmtquery/default.nix
@@ -9,6 +9,10 @@ stdenv.mkDerivation {
 
   buildInputs = [ libmtsupport libfacet libbtree multitrandata ];
 
+  NIX_LDFLAGS = [
+    "-lbtree"
+  ];
+
   patchPhase = ''
     sed -i -e 's@\$(DESTDIR)/usr@'$out'@' \
       -e 's@/usr/include/mt/support@${libmtsupport}/include/mt/support@' \

From a6d2bff76585f0343fc69e40039c5954033bdc83 Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Fri, 4 Jan 2019 19:33:50 +0000
Subject: [PATCH 37/55] opendungeons: link with pthreads explicitly

---
 pkgs/games/opendungeons/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/games/opendungeons/default.nix b/pkgs/games/opendungeons/default.nix
index 2a162525388..3c4e85a91e5 100644
--- a/pkgs/games/opendungeons/default.nix
+++ b/pkgs/games/opendungeons/default.nix
@@ -15,6 +15,9 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ cmake ogre cegui boost sfml openal ois ];
+  NIX_LDFLAGS = [
+    "-lpthread"
+  ];
 
   meta = with stdenv.lib; {
     description = "An open source, real time strategy game sharing game elements with the Dungeon Keeper series and Evil Genius.";

From 86b97b22b6c52bacceafb49e0a329ea2657d76d3 Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Fri, 4 Jan 2019 19:33:50 +0000
Subject: [PATCH 38/55] parcellite: link with libgio-2.0 explicitely

---
 pkgs/tools/misc/parcellite/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/misc/parcellite/default.nix b/pkgs/tools/misc/parcellite/default.nix
index 37073daa699..1e747961499 100644
--- a/pkgs/tools/misc/parcellite/default.nix
+++ b/pkgs/tools/misc/parcellite/default.nix
@@ -15,6 +15,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ autoreconfHook intltool pkgconfig wrapGAppsHook ];
   buildInputs = [ gtk2 hicolor-icon-theme ];
+  NIX_LDFLAGS = [ "-lgio-2.0" ];
 
   preFixup = ''
     # Need which and xdotool on path to fix auto-pasting.

From 90f5c4a810d588165240d1f9e012903f1f79f9b5 Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Fri, 4 Jan 2019 19:33:50 +0000
Subject: [PATCH 39/55] pianobooster: link with pthreads, libGL explicitly

---
 pkgs/applications/audio/pianobooster/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/audio/pianobooster/default.nix b/pkgs/applications/audio/pianobooster/default.nix
index d013a26277e..53afcdd2306 100644
--- a/pkgs/applications/audio/pianobooster/default.nix
+++ b/pkgs/applications/audio/pianobooster/default.nix
@@ -17,6 +17,7 @@ stdenv.mkDerivation  rec {
   preConfigure = "cd src";
 
   buildInputs = [ alsaLib cmake makeWrapper libGLU_combined qt4 ];
+  NIX_LDFLAGS = [ "-lGL" "-lpthread" ];
 
   postInstall = ''
     wrapProgram $out/bin/pianobooster \

From 8bc5a019e84910759e13b77a27fc1a5e9dc477a9 Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Fri, 4 Jan 2019 19:33:50 +0000
Subject: [PATCH 40/55] pure: link with libLLVMJIT explicitly

---
 pkgs/development/interpreters/pure/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/interpreters/pure/default.nix b/pkgs/development/interpreters/pure/default.nix
index c2b120576ea..188058a73b5 100644
--- a/pkgs/development/interpreters/pure/default.nix
+++ b/pkgs/development/interpreters/pure/default.nix
@@ -13,6 +13,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ bison flex makeWrapper ];
   propagatedBuildInputs = [ llvm gmp mpfr readline ];
+  NIX_LDFLAGS = [ "-lLLVMJIT" ];
 
   postPatch = ''
     for f in expr.cc matcher.cc printer.cc symtable.cc parserdefs.hh; do

From cfdcc387209669a9038f1f30c60ce380b097d07d Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Fri, 4 Jan 2019 19:33:50 +0000
Subject: [PATCH 41/55] qjoypad: link with libX11 explicitly

---
 pkgs/tools/misc/qjoypad/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/misc/qjoypad/default.nix b/pkgs/tools/misc/qjoypad/default.nix
index 6a5e674b698..4d91c184b0a 100644
--- a/pkgs/tools/misc/qjoypad/default.nix
+++ b/pkgs/tools/misc/qjoypad/default.nix
@@ -7,6 +7,7 @@ stdenv.mkDerivation rec {
   };
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ libX11 libXtst qt4 ];
+  NIX_LDFLAGS = [ "-lX11" ];
   patchPhase = ''
     cd src
     substituteInPlace config --replace /bin/bash /bin/sh

From b0f40b4e6026d2312c095ea11e7a65a38de9766e Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Fri, 4 Jan 2019 19:33:50 +0000
Subject: [PATCH 42/55] rox-filer: link with lib{dl,m} explicitly

---
 pkgs/desktops/rox/rox-filer/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/desktops/rox/rox-filer/default.nix b/pkgs/desktops/rox/rox-filer/default.nix
index 65e4463600a..543e3ca897f 100644
--- a/pkgs/desktops/rox/rox-filer/default.nix
+++ b/pkgs/desktops/rox/rox-filer/default.nix
@@ -13,6 +13,7 @@ in stdenv.mkDerivation {
 
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ libxml2 gtk shared-mime-info hicolor-icon-theme libSM ];
+  NIX_LDFLAGS = [ "-ldl" "-lm" ];
 
   patches = [
     ./rox-filer-2.11-in-source-build.patch

From 78ed5680621853e155c6bcd709ba072a4216b393 Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Fri, 4 Jan 2019 19:33:50 +0000
Subject: [PATCH 43/55] skype_call_recorder: link with libvorbis explicitly

---
 .../instant-messengers/skype-call-recorder/default.nix           | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/networking/instant-messengers/skype-call-recorder/default.nix b/pkgs/applications/networking/instant-messengers/skype-call-recorder/default.nix
index 5fcee73c0f9..3ac2b567a8c 100644
--- a/pkgs/applications/networking/instant-messengers/skype-call-recorder/default.nix
+++ b/pkgs/applications/networking/instant-messengers/skype-call-recorder/default.nix
@@ -16,6 +16,7 @@ stdenv.mkDerivation {
   patches = [ ./conference.patch ];
 
   buildInputs = [ cmake lame id3lib libvorbis qt4 libogg ];
+  NIX_LDFLAGS = [ "-lvorbis" ];
 
   meta = {
     homepage = http://atdot.ch/scr/;

From a898c8335d10119a1622c4a363cab2a6ae84e044 Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Fri, 4 Jan 2019 19:33:51 +0000
Subject: [PATCH 44/55] sqlitebrowser: link with libQt5PrintSupport explicitly

---
 pkgs/development/tools/database/sqlitebrowser/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/tools/database/sqlitebrowser/default.nix b/pkgs/development/tools/database/sqlitebrowser/default.nix
index 1b4a4b7f50b..929dfc61ba3 100644
--- a/pkgs/development/tools/database/sqlitebrowser/default.nix
+++ b/pkgs/development/tools/database/sqlitebrowser/default.nix
@@ -16,6 +16,10 @@ mkDerivation rec {
 
   nativeBuildInputs = [ cmake antlr qttools ];
 
+  NIX_LDFLAGS = [
+    "-lQt5PrintSupport"
+  ];
+
   enableParallelBuilding = true;
 
   # We have to patch out Test and PrintSupport to make this work with Qt 5.9

From a54cc22d4d20eb51f01c19562b6de5468122c874 Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Fri, 4 Jan 2019 19:33:51 +0000
Subject: [PATCH 45/55] ssmtp: link with libcrypto explicitly

---
 pkgs/tools/networking/ssmtp/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/tools/networking/ssmtp/default.nix b/pkgs/tools/networking/ssmtp/default.nix
index 4c906812f64..22f60bfcee5 100644
--- a/pkgs/tools/networking/ssmtp/default.nix
+++ b/pkgs/tools/networking/ssmtp/default.nix
@@ -36,6 +36,8 @@ stdenv.mkDerivation {
 
   buildInputs = stdenv.lib.optional tlsSupport openssl;
 
+  NIX_LDFLAGS = stdenv.lib.optional tlsSupport [ "-lcrypto" ];
+
   meta = with stdenv.lib; {
     platforms = platforms.linux;
     license = licenses.gpl2;

From 19061fb79e126c39c53c7aada9db9ea3b2f811d7 Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Fri, 4 Jan 2019 19:33:51 +0000
Subject: [PATCH 46/55] svnfs: link with libsvn_subr-1 explicitly

---
 pkgs/tools/filesystems/svnfs/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/filesystems/svnfs/default.nix b/pkgs/tools/filesystems/svnfs/default.nix
index 33371418217..ebfb211732e 100644
--- a/pkgs/tools/filesystems/svnfs/default.nix
+++ b/pkgs/tools/filesystems/svnfs/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
   '';
 
   NIX_CFLAGS_COMPILE="-I ${subversion.dev}/include/subversion-1";
-  NIX_LDFLAGS="-lsvn_client-1";
+  NIX_LDFLAGS="-lsvn_client-1 -lsvn_subr-1";
 
   meta = {
     description = "FUSE filesystem for accessing Subversion repositories";

From 510b678cb79238f2554dcd499779a4e341f810fb Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Fri, 4 Jan 2019 19:33:51 +0000
Subject: [PATCH 47/55] tangogps: link with libm explicitly

---
 pkgs/applications/misc/tangogps/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/misc/tangogps/default.nix b/pkgs/applications/misc/tangogps/default.nix
index bde30d9041a..08bea18d8e9 100644
--- a/pkgs/applications/misc/tangogps/default.nix
+++ b/pkgs/applications/misc/tangogps/default.nix
@@ -11,6 +11,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ gettext gtk2 gconf curl libexif sqlite libxml2 ];
+  NIX_LDFLAGS = [ "-lm" ];
 
   # bogus includes fail with newer library version
   postPatch = ''

From 1492dcccdaa5ff208bb0c0da47800c5961599a68 Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Fri, 4 Jan 2019 19:33:51 +0000
Subject: [PATCH 48/55] texmacs: link with libz explicitly

---
 pkgs/applications/editors/texmacs/default.nix | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/pkgs/applications/editors/texmacs/default.nix b/pkgs/applications/editors/texmacs/default.nix
index d3d95e5886a..ac5ac34d214 100644
--- a/pkgs/applications/editors/texmacs/default.nix
+++ b/pkgs/applications/editors/texmacs/default.nix
@@ -24,6 +24,7 @@ stdenv.mkDerivation {
   };
 
   buildInputs = [ guile_1_8 qt4 makeWrapper ghostscriptX freetype ];
+  NIX_LDFLAGS = [ "-lz" ];
 
   postInstall = "wrapProgram $out/bin/texmacs --suffix PATH : " +
         (if ghostscriptX == null then "" else "${ghostscriptX}/bin:") +
@@ -33,12 +34,6 @@ stdenv.mkDerivation {
 
   inherit (common) postPatch;
 
-  postFixup = ''
-    bin="$out/libexec/TeXmacs/bin/texmacs.bin"
-    rpath=$(patchelf --print-rpath "$bin")
-    patchelf --set-rpath "$rpath:${zlib.out}/lib" "$bin"
-  '';
-
   meta = common.meta // {
     maintainers = [ stdenv.lib.maintainers.roconnor ];
     platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux;  # arbitrary choice

From 89bcdd1184c8f996b6f9a7d76f8fe8a3815f2df2 Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Fri, 4 Jan 2019 19:33:51 +0000
Subject: [PATCH 49/55] timemachine: link with libm explicitly

---
 pkgs/applications/audio/timemachine/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/applications/audio/timemachine/default.nix b/pkgs/applications/audio/timemachine/default.nix
index 8837566b13d..643f5075298 100644
--- a/pkgs/applications/audio/timemachine/default.nix
+++ b/pkgs/applications/audio/timemachine/default.nix
@@ -19,6 +19,10 @@ stdenv.mkDerivation rec {
 
   preConfigure = "./autogen.sh";
 
+  NIX_LDFLAGS =  [
+    "-lm"
+  ];
+
   meta = {
     description = "JACK audio recorder";
     homepage = http://plugin.org.uk/timemachine/;

From bf61e100d7c9f10d02370a68dcbda71e8606958f Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Fri, 4 Jan 2019 19:33:51 +0000
Subject: [PATCH 50/55] xautoclick: use c++ compiler for linkage

---
 pkgs/applications/misc/xautoclick/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/misc/xautoclick/default.nix b/pkgs/applications/misc/xautoclick/default.nix
index 045354da3d6..bf3d9b737a9 100644
--- a/pkgs/applications/misc/xautoclick/default.nix
+++ b/pkgs/applications/misc/xautoclick/default.nix
@@ -21,6 +21,7 @@ stdenv.mkDerivation rec {
     mkdir .bin
     ln -s ${qt4}/bin/moc .bin/moc-qt4
     addToSearchPath PATH .bin
+    sed -i -e "s@LD=\$_cc@LD=\$_cxx@" configure
   '';
 
   meta = with stdenv.lib; {

From eb411132703a7e92097df0ae98a74adbed0397f1 Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Fri, 4 Jan 2019 19:33:51 +0000
Subject: [PATCH 51/55] qshowdiff: build with a c++ compiler

---
 pkgs/tools/text/qshowdiff/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/text/qshowdiff/default.nix b/pkgs/tools/text/qshowdiff/default.nix
index 761a498bcfb..e3970c05902 100644
--- a/pkgs/tools/text/qshowdiff/default.nix
+++ b/pkgs/tools/text/qshowdiff/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   configurePhase = ''
     mkdir -p $out/{bin,man/man1}
-    makeFlags="PREFIX=$out"
+    makeFlags="PREFIX=$out CC=$CXX"
   '';
 
   meta = {

From 2e5cb0cb5b6dd9994cc15892b053ae3d59fc1900 Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Fri, 4 Jan 2019 19:33:51 +0000
Subject: [PATCH 52/55] offrss: use c++ compiler for linkage

---
 pkgs/applications/networking/offrss/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/offrss/default.nix b/pkgs/applications/networking/offrss/default.nix
index d499916c7b6..d91bfbae501 100644
--- a/pkgs/applications/networking/offrss/default.nix
+++ b/pkgs/applications/networking/offrss/default.nix
@@ -12,7 +12,10 @@ stdenv.mkDerivation {
     ++ stdenv.lib.optional (stdenv.hostPlatform == stdenv.buildPlatform) podofo
     ++ stdenv.lib.optional (!stdenv.isLinux) libiconv;
 
-  configurePhase = stdenv.lib.optionalString (!stdenv.isLinux) ''
+  configurePhase = ''
+    substituteInPlace Makefile \
+      --replace '$(CC) $(CFLAGS) $(LDFLAGS)' '$(CXX) $(CFLAGS) $(LDFLAGS)'
+  '' + stdenv.lib.optionalString (!stdenv.isLinux) ''
     sed 's/#EXTRA/EXTRA/' -i Makefile
   '' + stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
     sed 's/^PDF/#PDF/' -i Makefile

From ac1122f264ea99f091ab413586cd739690a7ca1f Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Fri, 4 Jan 2019 19:33:51 +0000
Subject: [PATCH 53/55] pythonPackages.sipsimple: use c compiler for linkage

---
 pkgs/development/python-modules/sipsimple/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/python-modules/sipsimple/default.nix b/pkgs/development/python-modules/sipsimple/default.nix
index 1df36dcf5d0..bf76166d73b 100644
--- a/pkgs/development/python-modules/sipsimple/default.nix
+++ b/pkgs/development/python-modules/sipsimple/default.nix
@@ -25,6 +25,7 @@ buildPythonPackage rec {
 
   preConfigure = ''
     chmod +x ./deps/pjsip/configure ./deps/pjsip/aconfigure
+    export LD=$CC
   '';
 
   nativeBuildInputs = [ pkgs.pkgconfig ];

From 68c3097b9666fe036bb1574bd475175125a97518 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 5 Jan 2019 15:44:12 +0100
Subject: [PATCH 54/55] rtkit: link with librt explicitly

---
 pkgs/os-specific/linux/rtkit/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/os-specific/linux/rtkit/default.nix b/pkgs/os-specific/linux/rtkit/default.nix
index 059b0944961..78bcd925aea 100644
--- a/pkgs/os-specific/linux/rtkit/default.nix
+++ b/pkgs/os-specific/linux/rtkit/default.nix
@@ -34,6 +34,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ dbus libcap ];
+  NIX_LDFLAGS = [ "-lrt" ];
 
   meta = with stdenv.lib; {
     homepage = http://0pointer.de/blog/projects/rtkit;

From 981b504ecddd981488578494304d141849697dba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 6 Jan 2019 12:13:19 +0100
Subject: [PATCH 55/55] gst_all_1.gst-plugins-ugly: link with libm explicitly

---
 pkgs/development/libraries/gstreamer/ugly/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/libraries/gstreamer/ugly/default.nix b/pkgs/development/libraries/gstreamer/ugly/default.nix
index 6bc2ea8af89..0cdfd1f4a7b 100644
--- a/pkgs/development/libraries/gstreamer/ugly/default.nix
+++ b/pkgs/development/libraries/gstreamer/ugly/default.nix
@@ -39,4 +39,6 @@ stdenv.mkDerivation rec {
     libintl
   ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks;
     [ IOKit CoreFoundation DiskArbitration ]);
+
+  NIX_LDFLAGS = [ "-lm" ];
 }