commit eae4f22176789ce3b6a66bad773a45b12e895cdf · pyrox.dev/nixpkgs

+29 -20

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
       39
       -
         outputs = [ "out" ] ++ optionals propagateDoc [ "man" ];

     

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

     

       40
       41
        
       

     

       41
       42
        
         passthru = {

     

       42
       43
        
           inherit pkg-config;

     
···

       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}"

     

       68
       68
       +
           ''

     

       69
       69
       +
           # symlink in share for autoconf to find macros

     

       70
       70
       +
       

     

       71
       71
       +
           # TODO(@Ericson2314): in the future just make the unwrapped pkg-config a

     

       72
       72
       +
           # propagated dep once we can rely on downstream deps comming first in

     

       73
       73
       +
           # search paths. (https://github.com/NixOS/nixpkgs/pull/31414 took a crack

     

       74
       74
       +
           # at this.)

     

       75
       75
       +
           + ''

     

       76
       76
       +
             ln -s ${pkg-config}/share $out/share

     

       67
       77
        
           '';

     

       68
       78
        
       

     

       69
       79
        
         strictDeps = true;

     
···

       76
       86
        
         ];

     

       77
       87
        
       

     

       78
       88
        
         postFixup =

     

       89
       89
       +
           ##

     

       90
       90
       +
           ## User env support

     

       91
       91
       +
           ##

     

       92
       92
       +
       

     

       93
       93
       +
           # Propagate the underling unwrapped pkg-config so that if you

     

       94
       94
       +
           # install the wrapper, you get anything else it might provide.

     

       79
       95
        
           ''

     

       80
       80
       -
       

     

       81
       81
       -
             ##

     

       82
       82
       -
             ## User env support

     

       83
       83
       -
             ##

     

       84
       84
       -
       

     

       85
       85
       -
             # Propagate the underling unwrapped pkg-config so that if you

     

       86
       86
       -
             # install the wrapper, you get anything else it might provide.

     

       87
       96
        
             printWords ${pkg-config} > $out/nix-support/propagated-user-env-packages

     

       88
       97
        
           ''

     

       89
       98
        
       

     

       90
       90
       -
           + optionalString propagateDoc ''

     

       91
       91
       -
             ##

     

       92
       92
       -
             ## Man page and info support

     

       93
       93
       -
             ##

     

       94
       94
       -
       

     

       99
       99
       +
           ##

     

       100
       100
       +
           ## Man page and doc support

     

       101
       101
       +
           ##

     

       102
       102
       +
           + optionalString propagateDoc (''

     

       95
       103
        
             ln -s ${pkg-config.man} $man

     

       96
       96
       -
           ''

     

       104
       104
       +
           '' + optionalString (pkg-config ? doc) ''

     

       105
       105
       +
             ln -s ${pkg-config.doc} $doc

     

       106
       106
       +
           '')

     

       97
       107
        
       

     

       98
       108
        
           + ''

     

       99
       109
        
             substituteAll ${./add-flags.sh} $out/nix-support/add-flags.sh

     

       100
       110
        
             substituteAll ${../wrapper-common/utils.bash} $out/nix-support/utils.bash

     

       101
       101
       -
       

     

       102
       102
       -
             ##

     

       103
       103
       -
             ## Extra custom steps

     

       104
       104
       -
             ##

     

       105
       111
        
           ''

     

       106
       112
        
       

     

       113
       113
       +
           ##

     

       114
       114
       +
           ## Extra custom steps

     

       115
       115
       +
           ##

     

       107
       116
        
           + extraBuildCommands;

     

       108
       117
        
       

     

       109
       118
        
         meta =

+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 -2

pkgs/development/tools/misc/pkg-config/default.nix

···

       11
       11
        
           sha256 = "14fmwzki1rlz8bs2p810lk6jqdxsk966d8drgsjmi54cd00rrikg";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       +
         outputs = [ "out" "man" "doc" ];

     

       15
       15
       +
       

     

       14
       16
        
         # Process Requires.private properly, see

     

       15
       15
       -
         # http://bugs.freedesktop.org/show_bug.cgi?id=4738.

     

       17
       17
       +
         # http://bugs.freedesktop.org/show_bug.cgi?id=4738, migrated to

     

       18
       18
       +
         # https://gitlab.freedesktop.org/pkg-config/pkg-config/issues/28

     

       16
       19
        
         patches = optional (!vanilla) ./requires-private.patch

     

       17
       20
        
           ++ optional stdenv.isCygwin ./2.36.3-not-win32.patch;

     

       18
       21
        
       

     

       19
       22
        
         # These three tests fail due to a (desired) behavior change from our ./requires-private.patch

     

       20
       20
       -
         postPatch = ''

     

       23
       23
       +
         postPatch = if vanilla then null else ''

     

       21
       24
        
           rm -f check/check-requires-private check/check-gtk check/missing

     

       22
       25
        
         '';

     

       23
       26

+28 -1

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

···

       1
       1
       -
       { stdenv, fetchurl }:

     

       1
       1
       +
       { stdenv, fetchurl, removeReferencesTo }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "pkgconf";

     

       5
       5
        
         version = "1.6.3";

     

       6
       6
       +
       

     

       7
       7
       +
         nativeBuildInputs = [ removeReferencesTo ];

     

       8
       8
       +
       

     

       9
       9
       +
         outputs = [ "out" "lib" "dev" "man" "doc" ];

     

       10
       10
       +
       

     

       11
       11
       +
         enableParallelBuilding = true;

     

       6
       12
        
       

     

       7
       13
        
         src = fetchurl {

     

       8
       14
        
           url = "https://distfiles.dereferenced.org/${pname}/${pname}-${version}.tar.xz";

     

       9
       15
        
           sha256 = "04525vv0y849vvc2pi60g5wd9fjp1wbhra2lniifi82y1ldv7w31";

     

       10
       16
        
         };

     

       17
       17
       +
       

     

       18
       18
       +
         # Debian has outputs like these too:

     

       19
       19
       +
         # https://packages.debian.org/source/buster/pkgconf, so take it this

     

       20
       20
       +
         # reference removing is safe.

     

       21
       21
       +
         postFixup = ''

     

       22
       22
       +
           remove-references-to \

     

       23
       23
       +
             -t "${placeholder "dev"}" \

     

       24
       24
       +
             "${placeholder "lib"}"/lib/* \

     

       25
       25
       +
             "${placeholder "out"}"/bin/*

     

       26
       26
       +
           remove-references-to \

     

       27
       27
       +
             -t "${placeholder "out"}" \

     

       28
       28
       +
             "${placeholder "lib"}"/lib/*

     

       29
       29
       +
         ''

     

       30
       30
       +
         # Move back share/aclocal. Yes, this normally goes in the dev output for good

     

       31
       31
       +
         # reason, but in this case the dev output is for the `libpkgconf` library,

     

       32
       32
       +
         # while the aclocal stuff is for the tool. The tool is already for use during

     

       33
       33
       +
         # development, so there is no reason to have separate "dev-bin" and "dev-lib"

     

       34
       34
       +
         # outputs or someting.

     

       35
       35
       +
         + ''

     

       36
       36
       +
           mv ${placeholder "dev"}/share ${placeholder "out"}

     

       37
       37
       +
         '';

     

       11
       38
        
       

     

       12
       39
        
         meta = with stdenv.lib; {

     

       13
       40
        
           description = "Package compiler and linker metadata toolkit";

+5 -1

pkgs/top-level/all-packages.nix

···

       10761
       10761
        
       

     

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

     

       10763
       10763
        
       

     

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

     

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

     

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

     

       10766
       10766
       +
           pkg-config = pkgconf-unwrapped;

     

       10767
       10767
       +
           baseBinName = "pkgconf";

     

       10768
       10768
       +
         };

     

       10765
       10769
        
       

     

       10766
       10770
        
         pkg-config-unwrapped = callPackage ../development/tools/misc/pkg-config { };

     

       10767
       10771
        
         pkg-config = callPackage ../build-support/pkg-config-wrapper {