Unverified Commit e72d6a1d authored by Martin Weinelt's avatar Martin Weinelt Committed by GitHub
Browse files

Merge pull request #287907 from NixOS/revert-282462-libbsd0118

Revert "libbsd: unstable-2023-04-29 -> 0.11.8"
parents f7087dd1 6e8add7a
Loading
Loading
Loading
Loading
+26 −7
Original line number Diff line number Diff line
{ lib
, stdenv
, fetchurl
, fetchFromGitLab
, fetchpatch
, autoreconfHook
, libmd
, gitUpdater
}:

stdenv.mkDerivation rec {
# Run `./get-version` for the new value when bumping the Git revision.
let gitVersion = "0.11.7-55-g73b2"; in

stdenv.mkDerivation {
  pname = "libbsd";
  version = "0.11.8";
  version = "unstable-2023-04-29";

  src = fetchurl {
    url = "https://libbsd.freedesktop.org/releases/${pname}-${version}.tar.xz";
    hash = "sha256-Vf36Jpb7TVWlkvqa0Uqd+JfHsACN2zswxBmRSEH4XzM=";
  src = fetchFromGitLab {
    domain = "gitlab.freedesktop.org";
    owner = "libbsd";
    repo = "libbsd";
    rev = "73b25a8f871b3a20f6ff76679358540f95d7dbfd";
    hash = "sha256-LS28taIMjRCl6xqg75eYOIrTDl8PzSa+OvrdiEOP1+U=";
  };

  outputs = [ "out" "dev" "man" ];
@@ -24,12 +31,24 @@ stdenv.mkDerivation rec {
  nativeBuildInputs = [ autoreconfHook ];
  propagatedBuildInputs = [ libmd ];

  patches = lib.optionals stdenv.isDarwin [
  patches = [
    # Fix `{get,set}progname(3bsd)` conditionalization
    # https://gitlab.freedesktop.org/libbsd/libbsd/-/issues/24
    (fetchpatch {
      url = "https://github.com/emilazy/libbsd/commit/0381f8d92873c5a19ced3ff861ee8ffe7825953e.patch";
      hash = "sha256-+RMg5eHLgC4gyX9zXM0ttNf7rd9E3UzJX/7UVCYGXx4=";
    })
  ] ++ lib.optionals stdenv.isDarwin [
    # Temporary build system hack from upstream maintainer
    # https://gitlab.freedesktop.org/libbsd/libbsd/-/issues/19#note_2017684
    ./darwin-fix-libbsd.sym.patch
  ];

  postPatch = ''
    substituteInPlace configure.ac \
      --replace 'm4_esyscmd([./get-version])' '[${gitVersion}]'
  '';

  passthru.updateScript = gitUpdater {
    # No nicer place to find latest release.
    url = "https://gitlab.freedesktop.org/libbsd/libbsd.git";