From 0263e06fbea13631a176b0cec87ebd56300717ce Mon Sep 17 00:00:00 2001
From: Emery Hemingway <ehmry@posteo.net>
Date: Tue, 19 Nov 2019 16:31:11 +0100
Subject: [PATCH] stdcxx: do not pass -stdlib=libc++ to the linker

---
 pkgs/stdcxx/default.nix | 4 ++--
 pkgs/stdcxx/stdcxx.pc   | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/stdcxx/default.nix b/pkgs/stdcxx/default.nix
index f64c241..937a647 100644
--- a/pkgs/stdcxx/default.nix
+++ b/pkgs/stdcxx/default.nix
@@ -18,8 +18,8 @@ in stdenv.mkDerivation rec {
   dontBuild = true;
 
   installPhase = ''
-    cflags=$NIX_CXXSTDLIB_COMPILE libs=$NIX_CXXSTDLIB_LINK \
-    	substituteAll ${./stdcxx.pc} ${pname}.pc
+    cflags=$NIX_CXXSTDLIB_COMPILE \
+      substituteAll ${./stdcxx.pc} ${pname}.pc
     mkdir -p $out/lib/pkgconfig
     install -Dm444 *.pc $out/lib/pkgconfig
   '';
diff --git a/pkgs/stdcxx/stdcxx.pc b/pkgs/stdcxx/stdcxx.pc
index 1329cd3..e2d0ca2 100644
--- a/pkgs/stdcxx/stdcxx.pc
+++ b/pkgs/stdcxx/stdcxx.pc
@@ -3,4 +3,3 @@ Description: Genode Standard C++ library
 Version: @version@
 Requires: libc libm
 Cflags:  @cflags@
-Libs: @libs@