pyrox.dev
Merge pull request #287907 from NixOS/revert-282462-libbsd0118
Revert "libbsd: unstable-2023-04-29 -> 0.11.8"
authored by Martin Weinelt and committed by GitHub e72d6a1d f7087dd1
+26
-7
pkgs/development/libraries/libbsd/default.nix
+26
-7
pkgs/development/libraries/libbsd/default.nix
···
1
{ lib
2
, stdenv
3
-
, fetchurl
4
, autoreconfHook
5
, libmd
6
, gitUpdater
7
}:
8
9
-
stdenv.mkDerivation rec {
10
pname = "libbsd";
11
-
version = "0.11.8";
12
13
-
src = fetchurl {
14
-
url = "https://libbsd.freedesktop.org/releases/${pname}-${version}.tar.xz";
15
-
hash = "sha256-Vf36Jpb7TVWlkvqa0Uqd+JfHsACN2zswxBmRSEH4XzM=";
16
};
17
18
outputs = [ "out" "dev" "man" ];
···
24
nativeBuildInputs = [ autoreconfHook ];
25
propagatedBuildInputs = [ libmd ];
26
27
-
patches = lib.optionals stdenv.isDarwin [
28
# Temporary build system hack from upstream maintainer
29
# https://gitlab.freedesktop.org/libbsd/libbsd/-/issues/19#note_2017684
30
./darwin-fix-libbsd.sym.patch
31
];
32
33
passthru.updateScript = gitUpdater {
34
# No nicer place to find latest release.
···
1
{ lib
2
, stdenv
3
+
, fetchFromGitLab
4
+
, fetchpatch
5
, autoreconfHook
6
, libmd
7
, gitUpdater
8
}:
9
10
+
# Run `./get-version` for the new value when bumping the Git revision.
11
+
let gitVersion = "0.11.7-55-g73b2"; in
12
+
13
+
stdenv.mkDerivation {
14
pname = "libbsd";
15
+
version = "unstable-2023-04-29";
16
17
+
src = fetchFromGitLab {
18
+
domain = "gitlab.freedesktop.org";
19
+
owner = "libbsd";
20
+
repo = "libbsd";
21
+
rev = "73b25a8f871b3a20f6ff76679358540f95d7dbfd";
22
+
hash = "sha256-LS28taIMjRCl6xqg75eYOIrTDl8PzSa+OvrdiEOP1+U=";
23
};
24
25
outputs = [ "out" "dev" "man" ];
···
31
nativeBuildInputs = [ autoreconfHook ];
32
propagatedBuildInputs = [ libmd ];
33
34
+
patches = [
35
+
# Fix `{get,set}progname(3bsd)` conditionalization
36
+
# https://gitlab.freedesktop.org/libbsd/libbsd/-/issues/24
37
+
(fetchpatch {
38
+
url = "https://github.com/emilazy/libbsd/commit/0381f8d92873c5a19ced3ff861ee8ffe7825953e.patch";
39
+
hash = "sha256-+RMg5eHLgC4gyX9zXM0ttNf7rd9E3UzJX/7UVCYGXx4=";
40
+
})
41
+
] ++ lib.optionals stdenv.isDarwin [
42
# Temporary build system hack from upstream maintainer
43
# https://gitlab.freedesktop.org/libbsd/libbsd/-/issues/19#note_2017684
44
./darwin-fix-libbsd.sym.patch
45
];
46
+
47
+
postPatch = ''
48
+
substituteInPlace configure.ac \
49
+
--replace 'm4_esyscmd([./get-version])' '[${gitVersion}]'
50
+
'';
51
52
passthru.updateScript = gitUpdater {
53
# No nicer place to find latest release.