Merge pull request #168355 from AndersonTorres/new-misc

pkgconf: refactor

pkgs/development/tools/misc/pkgconf/default.nix

@@ -1,31 +1,35 @@
-{ lib, stdenv, fetchurl, removeReferencesTo }:
+{ lib
+, stdenv
+, fetchurl
+, removeReferencesTo
+}:
 
 stdenv.mkDerivation rec {
   pname = "pkgconf";
   version = "1.8.0";
 
-  nativeBuildInputs = [ removeReferencesTo ];
+  src = fetchurl {
+    url = "https://distfiles.dereferenced.org/${pname}/${pname}-${version}.tar.xz";
+    hash = "sha256-75x+YYIrfLg1bm6eHcpY2VVvMgDXisqzXkNH6dTCu68=";
+  };
 
   outputs = [ "out" "lib" "dev" "man" "doc" ];
 
+  nativeBuildInputs = [ removeReferencesTo ];
+
   enableParallelBuilding = true;
 
-  src = fetchurl {
-    url = "https://distfiles.dereferenced.org/${pname}/${pname}-${version}.tar.xz";
-    sha256 = "sha256-75x+YYIrfLg1bm6eHcpY2VVvMgDXisqzXkNH6dTCu68=";
-  };
-
-  # Debian has outputs like these too:
-  # https://packages.debian.org/source/buster/pkgconf, so take it this
-  # reference removing is safe.
+  # Debian has outputs like these too
+  # (https://packages.debian.org/source/bullseye/pkgconf), so it is safe to
+  # remove those references
   postFixup = ''
+    remove-references-to \
+      -t "${placeholder "out"}" \
+      "${placeholder "lib"}"/lib/*
     remove-references-to \
       -t "${placeholder "dev"}" \
       "${placeholder "lib"}"/lib/* \
       "${placeholder "out"}"/bin/*
-    remove-references-to \
-      -t "${placeholder "out"}" \
-      "${placeholder "lib"}"/lib/*
   ''
   # Move back share/aclocal. Yes, this normally goes in the dev output for good
   # reason, but in this case the dev output is for the `libpkgconf` library,
@@ -37,10 +41,19 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with lib; {
+    homepage = "https://github.com/pkgconf/pkgconf";
     description = "Package compiler and linker metadata toolkit";
-    homepage = "https://git.dereferenced.org/pkgconf/pkgconf";
-    platforms = platforms.all;
+    longDescription = ''
+      pkgconf is a program which helps to configure compiler and linker flags
+      for development libraries. It is similar to pkg-config from
+      freedesktop.org.
+
+      libpkgconf is a library which provides access to most of pkgconf's
+      functionality, to allow other tooling such as compilers and IDEs to
+      discover and use libraries configured by pkgconf.
+    '';
     license = licenses.isc;
-    maintainers = with maintainers; [ zaninime ];
+    maintainers = with maintainers; [ zaninime AndersonTorres ];
+    platforms = platforms.all;
   };
 }

pkgs/top-level/all-packages.nix

@@ -15548,7 +15548,7 @@ with pkgs;
 
   pmccabe = callPackage ../development/tools/misc/pmccabe { };
 
-  pkgconf-unwrapped = callPackage ../development/tools/misc/pkgconf {};
+  pkgconf-unwrapped = callPackage ../development/tools/misc/pkgconf { };
   pkgconf = callPackage ../build-support/pkg-config-wrapper {
     pkg-config = pkgconf-unwrapped;
     baseBinName = "pkgconf";