Merge master into staging-next

pkgs/tools/typesetting/lowdown/default.nix

@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, which }:
+{ lib, stdenv, fetchurl, fixDarwinDylibNames, which }:
 
 stdenv.mkDerivation rec {
   pname = "lowdown";
@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
     sha512 = "18q8i8lh8w127vzw697n0bzv4mchhna1p4s672hjvy39l3ls8rlj5nwq5npr5fry06yil62sjmq4652vw29r8l49wwk5j82a8l2nr7c";
   };
 
-  nativeBuildInputs = [ which ];
+  nativeBuildInputs = [ which ]
+    ++ lib.optionals stdenv.isDarwin [ fixDarwinDylibNames ];
 
   configurePhase = ''
     ./configure PREFIX=''${!outputDev} \
@@ -20,6 +21,11 @@ stdenv.mkDerivation rec {
                 MANDIR=''${!outputMan}/share/man
   '';
 
+  # Fix lib extension so that fixDarwinDylibNames detects it
+  postInstall = lib.optionalString stdenv.isDarwin ''
+    mv $lib/lib/liblowdown.{so,dylib}
+  '';
+
   patches = lib.optional (!stdenv.hostPlatform.isStatic) ./shared.patch;
 
   meta = with lib; {