Merge master into staging-next

2021-01-24 12:41:11 +00:00
parent 4acf7fd6bc 5cdf493674
commit 09e2990117
9 changed files with 23 additions and 14 deletions
@@ -83,7 +83,9 @@ self = stdenv.mkDerivation rec {
    Libs: -L$out/lib -llua -lm
    Cflags: -I$out/include
    EOF
+    ln -s "$out/lib/pkgconfig/lua.pc" "$out/lib/pkgconfig/lua-${luaversion}.pc"
    ln -s "$out/lib/pkgconfig/lua.pc" "$out/lib/pkgconfig/lua${luaversion}.pc"
+    ln -s "$out/lib/pkgconfig/lua.pc" "$out/lib/pkgconfig/lua${lib.replaceStrings [ "." ] [ "" ] luaversion}.pc"
  '';

  passthru = rec {