diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-03-14 00:02:12 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-14 00:02:12 +0000 |
| commit | ea64a128d1ed70c40ce897d0d8cc569e2eb394cd (patch) | |
| tree | 7c100fb9a45eeffc2013e0edac4287f3533f3110 /pkgs/development/libraries | |
| parent | 38910351b753e23a1731fd95fa99765d3a21dcc5 (diff) | |
| parent | 1073633d8914364109bf453af7bed0aa06e5f5bf (diff) | |
| download | nixpkgs-ea64a128d1ed70c40ce897d0d8cc569e2eb394cd.tar nixpkgs-ea64a128d1ed70c40ce897d0d8cc569e2eb394cd.tar.gz nixpkgs-ea64a128d1ed70c40ce897d0d8cc569e2eb394cd.tar.bz2 nixpkgs-ea64a128d1ed70c40ce897d0d8cc569e2eb394cd.tar.lz nixpkgs-ea64a128d1ed70c40ce897d0d8cc569e2eb394cd.tar.xz nixpkgs-ea64a128d1ed70c40ce897d0d8cc569e2eb394cd.tar.zst nixpkgs-ea64a128d1ed70c40ce897d0d8cc569e2eb394cd.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/libraries')
| -rw-r--r-- | pkgs/development/libraries/vte/default.nix | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/pkgs/development/libraries/vte/default.nix b/pkgs/development/libraries/vte/default.nix index 0411086c78c..eae934a4ebb 100644 --- a/pkgs/development/libraries/vte/default.nix +++ b/pkgs/development/libraries/vte/default.nix @@ -21,6 +21,7 @@ , zlib , icu , systemd +, systemdSupport ? stdenv.hostPlatform.isLinux }: stdenv.mkDerivation rec { @@ -63,6 +64,7 @@ stdenv.mkDerivation rec { pcre2 zlib icu + ] ++ lib.optionals systemdSupport [ systemd ]; @@ -73,6 +75,10 @@ stdenv.mkDerivation rec { pango ]; + mesonFlags = lib.optionals (!systemdSupport) [ + "-D_systemd=false" + ]; + postPatch = '' patchShebangs perf/* patchShebangs src/box_drawing_generate.sh |