mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-09-29 16:57:40 +03:00
40eff710af
Reverts NixOS/nixpkgs#269620 -eab0837b68caused a mass-rebuild on master - self-merge on a critical package without review and not waiting for the active owner team Below are the reverts of the commits from that PR Revert "systemd: migrate to by-name" This reverts commit33d2a40d67. Revert "systemd: add meta.longDescription" This reverts commit7c588d141d. Revert "systemd: cosmetic rewording of code" This reverts commitd91b8d9fcb. Revert "systemd: cosmetic rewording of comments" This reverts commitbc563998c0. Revert "systemd: remove some redundancy on mesonFlags" This reverts commiteab0837b68. Revert "systemd: use lib.meson* functions" This reverts commit1129756b1a.
31 lines
1.0 KiB
Diff
31 lines
1.0 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
|
|
Date: Sun, 6 Dec 2020 08:34:19 +0100
|
|
Subject: [PATCH] pkg-config: derive prefix from --prefix
|
|
|
|
Point prefix to the one configured, instead of `/usr` `systemd` has limited
|
|
support for making the pkgconfig prefix overridable, and interpolates those
|
|
values later down.
|
|
|
|
So we only need to patch this one value to get the correct paths.
|
|
See systemd/systemd@bc4e6e27922a2873985ab9367d79fb099f70b505 for details.
|
|
|
|
Co-Authored-By: Florian Klink <flokli@flokli.de>
|
|
---
|
|
src/core/systemd.pc.in | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/src/core/systemd.pc.in b/src/core/systemd.pc.in
|
|
index 5932a21b5b..20bf8e316d 100644
|
|
--- a/src/core/systemd.pc.in
|
|
+++ b/src/core/systemd.pc.in
|
|
@@ -11,7 +11,7 @@
|
|
# considered deprecated (though there is no plan to remove them). New names
|
|
# shall have underscores.
|
|
|
|
-prefix=/usr
|
|
+prefix={{PREFIX}}
|
|
root_prefix={{ROOTPREFIX_NOSLASH}}
|
|
rootprefix=${root_prefix}
|
|
sysconf_dir={{SYSCONF_DIR}}
|