Unverified Commit 19f597b8 authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

Merge pull request #192896 from SamLukeYes/pacman

pacman: add missing PATHs
parents fdc3ca14 6dcf688d
Loading
Loading
Loading
Loading
+24 −6
Original line number Diff line number Diff line
@@ -4,7 +4,6 @@
, fetchurl
, asciidoc
, binutils
, bzip2
, coreutils
, curl
, gnupg
@@ -17,9 +16,19 @@
, openssl
, perl
, pkg-config
, xz
, zlib

# Compression tools in scripts/libmakepkg/util/compress.sh.in
, gzip
, bzip2
, xz
, zstd
, lrzip
, lzop
, ncompress
, lz4
, lzip

# Tells pacman where to find ALPM hooks provided by packages.
# This path is very likely to be used in an Arch-like root.
, sysHookDir ? "/usr/share/libalpm/hooks/"
@@ -44,13 +53,11 @@ stdenv.mkDerivation rec {
  ];

  buildInputs = [
    bzip2
    curl
    gpgme
    libarchive
    openssl
    perl
    xz
    zlib
  ];

@@ -63,7 +70,18 @@ stdenv.mkDerivation rec {
    })
  ];

  postPatch = ''
  postPatch = let compressionTools = [
    gzip
    bzip2
    xz
    zstd
    lrzip
    lzop
    ncompress
    lz4
    lzip
  ]; in ''
    echo 'export PATH=${lib.makeBinPath compressionTools}:$PATH' >> scripts/libmakepkg/util/compress.sh.in
    substituteInPlace meson.build \
      --replace "install_dir : SYSCONFDIR" "install_dir : '$out/etc'" \
      --replace "join_paths(DATAROOTDIR, 'libalpm/hooks/')" "'${sysHookDir}'" \
@@ -88,7 +106,7 @@ stdenv.mkDerivation rec {
    wrapProgram $out/bin/makepkg \
      --prefix PATH : ${lib.makeBinPath [ binutils ]}
    wrapProgram $out/bin/pacman-key \
      --prefix PATH : ${lib.makeBinPath [ gnupg ]}
      --prefix PATH : ${lib.makeBinPath [ "${placeholder "out"}" gnupg ]}
  '';

  meta = with lib; {