commit 95080ea90ba705f2a17e48b7cd824f2d0d2c44a3 · pyrox.dev/nixpkgs

+3 -2

pkgs/build-support/pkg-config-wrapper/default.nix

···

       4
       4
        
       { stdenvNoCC

     

       5
       5
        
       , buildPackages

     

       6
       6
        
       , pkg-config

     

       7
       7
       +
       , baseBinName ? "pkg-config"

     

       7
       8
        
       , propagateDoc ? pkg-config != null && pkg-config ? man

     

       8
       9
        
       , extraPackages ? [], extraBuildCommands ? ""

     

       9
       10
        
       }:

     
···

       34
       35
        
       

     

       35
       36
        
         shell = getBin stdenvNoCC.shell + stdenvNoCC.shell.shellPath or "";

     

       36
       37
        
       

     

       37
       37
       -
         inherit targetPrefix suffixSalt;

     

       38
       38
       +
         inherit targetPrefix suffixSalt baseBinName;

     

       38
       39
        
       

     

       39
       40
        
         outputs = [ "out" ] ++ optionals propagateDoc ([ "man" ] ++ optional (pkg-config ? doc) "doc");

     

       40
       41
        
       

     
···

       63
       64
        
       

     

       64
       65
        
             echo $pkg-config > $out/nix-support/orig-pkg-config

     

       65
       66
        
       

     

       66
       66
       -
             wrap ${targetPrefix}pkg-config ${./pkg-config-wrapper.sh} "${getBin pkg-config}/bin/pkg-config"

     

       67
       67
       +
             wrap ${targetPrefix}${baseBinName} ${./pkg-config-wrapper.sh} "${getBin pkg-config}/bin/${baseBinName}"

     

       67
       68
        
           ''

     

       68
       69
        
           # symlink in share for autoconf to find macros

     

       69
       70

+1 -1

pkgs/build-support/pkg-config-wrapper/setup-hook.sh

···

       23
       23
        
       

     

       24
       24
        
       addEnvHooks "$targetOffset" pkgConfigWrapper_addPkgConfigPath

     

       25
       25
        
       

     

       26
       26
       -
       export PKG_CONFIG${role_post}=@targetPrefix@pkg-config

     

       26
       26
       +
       export PKG_CONFIG${role_post}=@targetPrefix@@baseBinName@

     

       27
       27
        
       

     

       28
       28
        
       # No local scope in sourced file

     

       29
       29
        
       unset -v role_post

+5 -1

pkgs/top-level/all-packages.nix

···

       10739
       10739
        
       

     

       10740
       10740
        
         pmccabe = callPackage ../development/tools/misc/pmccabe { };

     

       10741
       10741
        
       

     

       10742
       10742
       -
         pkgconf = callPackage ../development/tools/misc/pkgconf {};

     

       10742
       10742
       +
         pkgconf-unwrapped = callPackage ../development/tools/misc/pkgconf {};

     

       10743
       10743
       +
         pkgconf = callPackage ../build-support/pkg-config-wrapper {

     

       10744
       10744
       +
           pkg-config = pkgconf-unwrapped;

     

       10745
       10745
       +
           baseBinName = "pkgconf";

     

       10746
       10746
       +
         };

     

       10743
       10747
        
       

     

       10744
       10748
        
         pkg-config-unwrapped = callPackage ../development/tools/misc/pkg-config { };

     

       10745
       10749
        
         pkg-config = callPackage ../build-support/pkg-config-wrapper {