eos-installer: 4.0.3 -> 5.0.2

This commit is contained in:
Alyssa Ross 2023-04-09 14:26:10 +00:00
parent 10a0be03de
commit 98b6f72610

View file

@ -1,40 +1,44 @@
{ lib, stdenv, fetchFromGitHub { lib, stdenv, fetchFromGitHub, writeText
, autoconf, autoconf-archive, automake, glib, intltool, libtool, pkg-config , glib, meson, ninja, pkg-config, python3
, gnome-desktop, gnupg, gtk3, udisks , coreutils, gnome-desktop, gnupg, gtk3, systemdMinimal, udisks
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "eos-installer"; pname = "eos-installer";
version = "4.0.3"; version = "5.0.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "endlessm"; owner = "endlessm";
repo = "eos-installer"; repo = "eos-installer";
rev = "Release_${version}"; rev = "Release_${version}";
sha256 = "1nl6vim5dd83kvskmf13xp9d6zx39fayz4z0wqwf7xf4nwl07gwz"; sha256 = "utTTux8o8TN51bvnGldrtMEatiLA1AiHf/9XJZ7k7KM=";
fetchSubmodules = true; fetchSubmodules = true;
}; };
strictDeps = true; strictDeps = true;
nativeBuildInputs = [ nativeBuildInputs = [
autoconf autoconf-archive automake glib intltool libtool pkg-config glib gnupg meson ninja pkg-config python3
]; ];
buildInputs = [ gnome-desktop gtk3 udisks ]; buildInputs = [ gnome-desktop gtk3 systemdMinimal udisks ];
preConfigure = '' preConfigure = ''
./autogen.sh patchShebangs tests
substituteInPlace tests/test-scribe.c \
--replace /bin/true ${coreutils}/bin/true \
--replace /bin/false ${coreutils}/bin/false
''; '';
configureFlags = [ mesonFlags = [
"--libexecdir=${placeholder "out"}/bin" "--libexecdir=${placeholder "out"}/bin"
"--localstatedir=/var" "--cross-file=${writeText "crossfile.ini" ''
"--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system" [binaries]
gpg = '${gnupg}/bin/gpg'
''}"
]; ];
# These are for runtime, so can't be discovered from PATH, which PKG_CONFIG_SYSTEMD_SYSTEMDSYSTEMUNITDIR = "${placeholder "out"}/lib/systemd/system";
# is constructed from nativeBuildInputs.
GPG_PATH = "${gnupg}/bin/gpg"; doCheck = true;
GPGCONF_PATH = "${gnupg}/bin/gpgconf";
enableParallelBuilding = true; enableParallelBuilding = true;