wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-25 14:51:16 +02:00
Code Activity

api docs: Use mkMesonDerivation

Browse source
This commit is contained in:
Robert Hensing 2024-07-06 17:41:05 +02:00
parent b7e5446b81
commit 4d0c55ae55
2 changed files with 37 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/external-api-docs/package.nix
View file

@ -1,5 +1,5 @@
{ lib { lib
, stdenv , mkMesonDerivation
, meson , meson
, ninja , ninja
@ -14,17 +14,18 @@ let
inherit (lib) fileset; inherit (lib) fileset;
in in
stdenv.mkDerivation (finalAttrs: { mkMesonDerivation (finalAttrs: {
pname = "nix-external-api-docs"; pname = "nix-external-api-docs";
version = lib.fileContents ./.version + versionSuffix; version = lib.fileContents ./.version + versionSuffix;
src = fileset.toSource { workDir = ./.;
root = ../..;
fileset = fileset =
let let
cpp = fileset.fileFilter (file: file.hasExt "cc" || file.hasExt "h"); cpp = fileset.fileFilter (file: file.hasExt "cc" || file.hasExt "h");
in in
fileset.unions [ fileset.unions [
./.version
../../.version
./meson.build ./meson.build
./doxygen.cfg.in ./doxygen.cfg.in
./README.md ./README.md
@ -34,7 +35,6 @@ stdenv.mkDerivation (finalAttrs: {
(cpp ../libstore-c) (cpp ../libstore-c)
(cpp ../libutil-c) (cpp ../libutil-c)
]; ];
};
nativeBuildInputs = [ nativeBuildInputs = [
meson meson
@ -42,14 +42,10 @@ stdenv.mkDerivation (finalAttrs: {
doxygen doxygen
]; ];
postUnpack = ''
sourceRoot=$sourceRoot/src/external-api-docs
'';
preConfigure = preConfigure =
# "Inline" .version so it's not a symlink, and includes the suffix
'' ''
echo ${finalAttrs.version} > .version chmod u+w ./.version
echo ${finalAttrs.version} > ./.version
''; '';
postInstall = '' postInstall = ''

18
src/internal-api-docs/package.nix
View file

@ -1,5 +1,5 @@
{ lib { lib
, stdenv , mkMesonDerivation
, meson , meson
, ninja , ninja
@ -14,22 +14,22 @@ let
inherit (lib) fileset; inherit (lib) fileset;
in in
stdenv.mkDerivation (finalAttrs: { mkMesonDerivation (finalAttrs: {
pname = "nix-internal-api-docs"; pname = "nix-internal-api-docs";
version = lib.fileContents ./.version + versionSuffix; version = lib.fileContents ./.version + versionSuffix;
src = fileset.toSource { workDir = ./.;
root = ../..;
fileset = let fileset = let
cpp = fileset.fileFilter (file: file.hasExt "cc" || file.hasExt "hh"); cpp = fileset.fileFilter (file: file.hasExt "cc" || file.hasExt "hh");
in fileset.unions [ in fileset.unions [
./.version
../../.version
./meson.build ./meson.build
./doxygen.cfg.in ./doxygen.cfg.in
# Source is not compiled, but still must be available for Doxygen # Source is not compiled, but still must be available for Doxygen
# to gather comments. # to gather comments.
(cpp ../.) (cpp ../.)
]; ];
};
nativeBuildInputs = [ nativeBuildInputs = [
meson meson
@ -37,14 +37,10 @@ stdenv.mkDerivation (finalAttrs: {
doxygen doxygen
]; ];
postUnpack = ''
sourceRoot=$sourceRoot/src/internal-api-docs
'';
preConfigure = preConfigure =
# "Inline" .version so it's not a symlink, and includes the suffix
'' ''
echo ${finalAttrs.version} > .version chmod u+w ./.version
echo ${finalAttrs.version} > ./.version
''; '';
postInstall = '' postInstall = ''