diff options
| author | Artturin <Artturin@artturin.com> | 2022-12-07 06:16:50 +0200 |
|---|---|---|
| committer | Artturin <Artturin@artturin.com> | 2022-12-08 21:05:28 +0200 |
| commit | adc8900df1758eda56abd68f7d781d1df74fa531 (patch) | |
| tree | 56f15a032fd0ba8df83195f6d9d6ee2870d4e838 /pkgs/build-support/pkg-config-wrapper | |
| parent | 734d7df2351ac1a10774e665447c5cdc286fc16e (diff) | |
| download | nixpkgs-adc8900df1758eda56abd68f7d781d1df74fa531.tar nixpkgs-adc8900df1758eda56abd68f7d781d1df74fa531.tar.gz nixpkgs-adc8900df1758eda56abd68f7d781d1df74fa531.tar.bz2 nixpkgs-adc8900df1758eda56abd68f7d781d1df74fa531.tar.lz nixpkgs-adc8900df1758eda56abd68f7d781d1df74fa531.tar.xz nixpkgs-adc8900df1758eda56abd68f7d781d1df74fa531.tar.zst nixpkgs-adc8900df1758eda56abd68f7d781d1df74fa531.zip | |
treewide: fix some core package structuredAttrs
Diffstat (limited to 'pkgs/build-support/pkg-config-wrapper')
| -rw-r--r-- | pkgs/build-support/pkg-config-wrapper/default.nix | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/pkgs/build-support/pkg-config-wrapper/default.nix b/pkgs/build-support/pkg-config-wrapper/default.nix index 312d2fe0261..ca14a4495fe 100644 --- a/pkgs/build-support/pkg-config-wrapper/default.nix +++ b/pkgs/build-support/pkg-config-wrapper/default.nix @@ -36,13 +36,10 @@ stdenv.mkDerivation { preferLocalBuild = true; - shell = getBin stdenvNoCC.shell + stdenvNoCC.shell.shellPath or ""; - - inherit targetPrefix suffixSalt baseBinName; - outputs = [ "out" ] ++ optionals propagateDoc ([ "man" ] ++ optional (pkg-config ? doc) "doc"); passthru = { + inherit targetPrefix suffixSalt; inherit pkg-config; }; @@ -83,8 +80,6 @@ stdenv.mkDerivation { ln -s ${pkg-config}/share $out/share ''; - wrapperName = "PKG_CONFIG_WRAPPER"; - setupHooks = [ ../setup-hooks/role.bash ./setup-hook.sh @@ -120,6 +115,12 @@ stdenv.mkDerivation { ## + extraBuildCommands; + env = { + shell = getBin stdenvNoCC.shell + stdenvNoCC.shell.shellPath or ""; + wrapperName = "PKG_CONFIG_WRAPPER"; + inherit targetPrefix suffixSalt baseBinName; + }; + meta = let pkg-config_ = if pkg-config != null then pkg-config else {}; in (if pkg-config_ ? meta then removeAttrs pkg-config.meta ["priority"] else {}) // |