gnu: Remove PKG_CONFIG_EXECUTABLE configure-flags.

* gnu/packages/bioinformatics.scm (vcflib): Remove setting PKG_CONFIG_EXECUTABLE flag. * gnu/packages/cpp.scm (hyprlang): same. * gnu/packages/cpp.scm (hyprutils): same. * gnu/packages/debian.scm (apt-cacher-ng): Same * gnu/packages/linux.scm (rdma-core): Same. * gnu/packages/radio.scm (libiio): Same. * gnu/packages/security-token.scm (libfido2): Same. * gnu/packages/version-control.scm (libgit2-1.9,libgit2-1.7): Same * gnu/packages/vulkan.scm (vulcan-loader): Same. Change-Id: I12cb5fb7f1a93fa01766b37a32777a269d4c089c Signed-off-by: Greg Hogan <code@greghogan.com>
2026-04-06 13:10:33 +02:00 · 2025-08-09 12:55:45 +00:00
parent 3fe0b451c6
commit bcc1881485
8 changed files with 9 additions and 79 deletions
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -22603,11 +22603,7 @@ sequences to accelerate the alignment process.")
      #~(list "-DZIG=OFF"
              "-DTABIXPP_LOCAL=OFF"
              "-DTABIX_FOUND=ON"
-              "-DWFA_GITMODULE=OFF"
-              (string-append "-DPKG_CONFIG_EXECUTABLE="
-                             (search-input-file
-                              %build-inputs (string-append
-                                             "/bin/" #$(pkg-config-for-target)))))
+              "-DWFA_GITMODULE=OFF")
      #:tests? #f                       ; no tests
      #:phases
      #~(modify-phases %standard-phases
--- a/gnu/packages/cpp.scm
+++ b/gnu/packages/cpp.scm
@@ -1050,17 +1050,6 @@ utilities used across the hypr* ecosystem.")
               (base32
                "06wiizy73f0x6zj1ar878gm1w9zam1gmgjw0ybixj3qag0gxqv34"))))
    (build-system cmake-build-system)
-    (arguments
-     (list
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-after 'unpack 'fix-cross-compilation
-            (lambda _
-              (substitute* "CMakeLists.txt"
-                (("find_package.PkgConfig" all)
-                 (string-append
-                  "set(PKG_CONFIG_EXECUTABLE " #$(pkg-config-for-target) ")\n"
-                  all))))))))
    (native-inputs (list gcc-15 pkg-config))
    (inputs (list hyprutils))
    (home-page "https://wiki.hypr.land/Hypr-Ecosystem/hyprlang/")
@@ -1084,18 +1073,7 @@ language used in Hyprland.")
               (base32
                "1ymiqzncppdik8lw3ad7xaqig6c7bjcy7crcwbq3rjfk2hrc8rmc"))))
    (build-system cmake-build-system)
-    (arguments
-     (list
-      #:tests? #f ; No tests in Release build type
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-after 'unpack 'fix-cross-compilation
-            (lambda _
-              (substitute* "CMakeLists.txt"
-                (("find_package.PkgConfig" all)
-                 (string-append
-                  "set(PKG_CONFIG_EXECUTABLE " #$(pkg-config-for-target) ")\n"
-                  all))))))))
+    (arguments (list #:tests? #f)) ; No tests in Release build type
    (native-inputs (list gcc-15 pkg-config))
    (inputs (list pixman))
    (home-page "https://github.com/hyprwm/hyprutils")
--- a/gnu/packages/debian.scm
+++ b/gnu/packages/debian.scm
@@ -646,12 +646,6 @@ debian/copyright for more information.")))))
    (native-inputs (list pkg-config))
    (arguments
     (list
-      #:configure-flags
-      #~(list
-         (string-append "-DPKG_CONFIG_EXECUTABLE="
-                        (search-input-file
-                         %build-inputs (string-append
-                                        "/bin/" #$(pkg-config-for-target)))))
      #:tests? #f ;Tests are "for development only".
      #:phases #~(modify-phases %standard-phases
                   ;; We want to provide good defaults. Here apt-cacher-ng is built
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -8512,17 +8512,10 @@ from the ntfs-3g package.  It is meant to be used in initrds.")
       ;; Upstream uses the "ninja" build system and encourage distros
       ;; to do the same for consistency.
       #:generator "Ninja"
-       #:configure-flags (list ,@(if (%current-target-system)
-                                     `((string-append
-                                        "-DPKG_CONFIG_EXECUTABLE="
-                                        (search-input-file
-                                         %build-inputs
-                                         (string-append "/bin/"
-                                                        ,(pkg-config-for-target)))))
-                                     '())
-                               (string-append "-DRST2MAN_EXECUTABLE="
-                                              (search-input-file
-                                               %build-inputs "/bin/rst2man.py")))))
+       #:configure-flags
+       (list (string-append "-DRST2MAN_EXECUTABLE="
+                            (search-input-file
+                             %build-inputs "/bin/rst2man.py")))))
    (native-inputs
     (list pkg-config python-wrapper python-docutils-0.19)) ;for 'rst2man'
    (inputs
--- a/gnu/packages/radio.scm
+++ b/gnu/packages/radio.scm
@@ -224,10 +224,6 @@ used as a drop-in substitute for @code{libfec}.")
      #:tests? #f
      #:configure-flags
      #~(list
-         (string-append "-DPKG_CONFIG_EXECUTABLE="
-                        (search-input-file
-                         %build-inputs
-                         (string-append "/bin/" #$(pkg-config-for-target))))
         (string-append "-DUDEV_RULES_INSTALL_DIR="
                        #$output "/lib/udev/rules.d")
         "-DOSX_PACKAGE=off"
--- a/gnu/packages/security-token.scm
+++ b/gnu/packages/security-token.scm
@@ -1131,12 +1131,7 @@ phone and a running pcscd service are required.")
    (arguments
     (list
      #:configure-flags
-      #~(list (string-append
-               "-DPKG_CONFIG_EXECUTABLE="
-               (search-input-file %build-inputs
-                                  (string-append
-                                   "/bin/" #$(pkg-config-for-target))))
-              (string-append "-DUDEV_RULES_DIR=" #$output "/lib/udev/rules.d"))
+      #~(list (string-append "-DUDEV_RULES_DIR=" #$output "/lib/udev/rules.d"))
      ;; regress tests enabled only for debug builds
      #:tests? #f))
    (synopsis "Library functionality and command-line tools for FIDO devices")
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -1275,15 +1275,6 @@ other git-like projects such as @code{libgit2}.")
                  "-DREGEX_BACKEND=pcre2"
                  "-DUSE_HTTP_PARSER=system"
                  "-DUSE_SSH=ON" ; cmake fails to find libssh if this is missing
-                  ,@(if (%current-target-system)
-                        `((string-append
-                           "-DPKG_CONFIG_EXECUTABLE="
-                           (search-input-file
-                            %build-inputs
-                            (string-append "/bin/" ,(%current-target-system)
-                                           "-pkg-config"))))
-                        '())
-                  ;; See https://github.com/libgit2/libgit2/issues/7169
                  ,@(if (target-64bit?)
                        '()
                        '("-DCMAKE_C_FLAGS=-D_FILE_OFFSET_BITS=64"))))
@@ -1369,15 +1360,7 @@ write native speed custom Git applications in any language with bindings.")
        `(list "-DUSE_NTLMCLIENT=OFF" ;TODO: package this
               "-DREGEX_BACKEND=pcre2"
               "-DUSE_HTTP_PARSER=system"
-               "-DUSE_SSH=ON" ; cmake fails to find libssh if this is missing
-               ,@(if (%current-target-system)
-                     `((string-append
-                        "-DPKG_CONFIG_EXECUTABLE="
-                        (search-input-file
-                         %build-inputs
-                         (string-append "/bin/" ,(%current-target-system)
-                                        "-pkg-config"))))
-                     '())))))))
+               "-DUSE_SSH=ON")))))) ; cmake fails to find libssh if this is missing

 (define-public libgit2-1.6
  (package
--- a/gnu/packages/vulkan.scm
+++ b/gnu/packages/vulkan.scm
@@ -403,12 +403,7 @@ Enhanced Subpixel Morphological Anti-Aliasing
                                       (search-input-directory
                                        %build-inputs "include/vulkan"))))
              #$@(if (%current-target-system)
-                     #~("-DBUILD_TESTS=OFF" "-DUSE_GAS=OFF"
-                        (string-append
-                         "-DPKG_CONFIG_EXECUTABLE="
-                         (search-input-file
-                          %build-inputs
-                          (string-append "bin/" #$(pkg-config-for-target)))))
+                     #~("-DBUILD_TESTS=OFF" "-DUSE_GAS=OFF")
                     #~("-DBUILD_TESTS=ON")))
      #:phases
      #~(modify-phases %standard-phases