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

packaging: Add mkMeson{Library,Executable}

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

10
src/libexpr/package.nix
View file

@ -1,6 +1,6 @@
{ lib
, stdenv
, mkMesonDerivation
, mkMesonLibrary
, bison
, flex
@ -34,7 +34,7 @@ let
inherit (lib) fileset;
in
mkMesonDerivation (finalAttrs: {
mkMesonLibrary (finalAttrs: {
pname = "nix-expr";
inherit version;
@ -57,8 +57,6 @@ mkMesonDerivation (finalAttrs: {
)
];
outputs = [ "out" "dev" ];
nativeBuildInputs = [
bison
flex
@ -98,10 +96,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;
};