diff --git a/packages.nix b/packages.nix index ae7aee7..37a60b3 100644 --- a/packages.nix +++ b/packages.nix @@ -23,7 +23,7 @@ in rec { genode-base-nova = genode.base-nova; genode-os = genode.os; libc = callPackage ./pkgs/libc { inherit depot; }; - stdcxx = callPackage ./pkgs/stdcxx { inherit depot; }; + stdcxx = callPackage ./pkgs/stdcxx { }; dhallGenode = dhallPackages.genode; dhallPrelude = dhallPackages.prelude; diff --git a/pkgs/stdcxx/default.nix b/pkgs/stdcxx/default.nix index 937a647..f64c241 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 \ - substituteAll ${./stdcxx.pc} ${pname}.pc + cflags=$NIX_CXXSTDLIB_COMPILE libs=$NIX_CXXSTDLIB_LINK \ + 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 e2d0ca2..1329cd3 100644 --- a/pkgs/stdcxx/stdcxx.pc +++ b/pkgs/stdcxx/stdcxx.pc @@ -3,3 +3,4 @@ Description: Genode Standard C++ library Version: @version@ Requires: libc libm Cflags: @cflags@ +Libs: @libs@