1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-07-06 21:41:48 +02:00

packaging: Add mkMeson{Library,Executable}

and:
- move pkg-config out of mkMesonDerivation, for components that don't
  produce any executable code
This commit is contained in:
Robert Hensing 2024-10-13 23:17:54 +02:00
parent e10ff893e5
commit 15e3e1543b
23 changed files with 73 additions and 151 deletions

View file

@ -1,6 +1,6 @@
{ lib
, stdenv
, mkMesonDerivation
, mkMesonLibrary
, nix-store-test-support
, nix-expr
@ -16,7 +16,7 @@ let
inherit (lib) fileset;
in
mkMesonDerivation (finalAttrs: {
mkMesonLibrary (finalAttrs: {
pname = "nix-util-test-support";
inherit version;
@ -32,8 +32,6 @@ mkMesonDerivation (finalAttrs: {
(fileset.fileFilter (file: file.hasExt "hh") ./.)
];
outputs = [ "out" "dev" ];
propagatedBuildInputs = [
nix-store-test-support
nix-expr
@ -55,10 +53,6 @@ mkMesonDerivation (finalAttrs: {
LDFLAGS = "-fuse-ld=gold";
};
separateDebugInfo = !stdenv.hostPlatform.isStatic;
hardeningDisable = lib.optional stdenv.hostPlatform.isStatic "pie";
meta = {
platforms = lib.platforms.unix ++ lib.platforms.windows;
};