tangled
alpha
login
or
join now
pyrox.dev
/
nixpkgs
0
fork
atom
lol
0
fork
atom
overview
issues
pulls
pipelines
eos-installer: 4.0.3 -> 5.0.2
Alyssa Ross
2 years ago
98b6f726
10a0be03
+19
-15
1 changed file
expand all
collapse all
unified
split
pkgs
applications
misc
eos-installer
default.nix
+19
-15
pkgs/applications/misc/eos-installer/default.nix
···
1
1
-
{ lib, stdenv, fetchFromGitHub
2
2
-
, autoconf, autoconf-archive, automake, glib, intltool, libtool, pkg-config
3
3
-
, gnome-desktop, gnupg, gtk3, udisks
1
1
+
{ lib, stdenv, fetchFromGitHub, writeText
2
2
+
, glib, meson, ninja, pkg-config, python3
3
3
+
, coreutils, gnome-desktop, gnupg, gtk3, systemdMinimal, udisks
4
4
}:
5
5
6
6
stdenv.mkDerivation rec {
7
7
pname = "eos-installer";
8
8
-
version = "4.0.3";
8
8
+
version = "5.0.2";
9
9
10
10
src = fetchFromGitHub {
11
11
owner = "endlessm";
12
12
repo = "eos-installer";
13
13
rev = "Release_${version}";
14
14
-
sha256 = "1nl6vim5dd83kvskmf13xp9d6zx39fayz4z0wqwf7xf4nwl07gwz";
14
14
+
sha256 = "utTTux8o8TN51bvnGldrtMEatiLA1AiHf/9XJZ7k7KM=";
15
15
fetchSubmodules = true;
16
16
};
17
17
18
18
strictDeps = true;
19
19
nativeBuildInputs = [
20
20
-
autoconf autoconf-archive automake glib intltool libtool pkg-config
20
20
+
glib gnupg meson ninja pkg-config python3
21
21
];
22
22
-
buildInputs = [ gnome-desktop gtk3 udisks ];
22
22
+
buildInputs = [ gnome-desktop gtk3 systemdMinimal udisks ];
23
23
24
24
preConfigure = ''
25
25
-
./autogen.sh
25
25
+
patchShebangs tests
26
26
+
substituteInPlace tests/test-scribe.c \
27
27
+
--replace /bin/true ${coreutils}/bin/true \
28
28
+
--replace /bin/false ${coreutils}/bin/false
26
29
'';
27
30
28
28
-
configureFlags = [
31
31
+
mesonFlags = [
29
32
"--libexecdir=${placeholder "out"}/bin"
30
30
-
"--localstatedir=/var"
31
31
-
"--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system"
33
33
+
"--cross-file=${writeText "crossfile.ini" ''
34
34
+
[binaries]
35
35
+
gpg = '${gnupg}/bin/gpg'
36
36
+
''}"
32
37
];
33
38
34
34
-
# These are for runtime, so can't be discovered from PATH, which
35
35
-
# is constructed from nativeBuildInputs.
36
36
-
GPG_PATH = "${gnupg}/bin/gpg";
37
37
-
GPGCONF_PATH = "${gnupg}/bin/gpgconf";
39
39
+
PKG_CONFIG_SYSTEMD_SYSTEMDSYSTEMUNITDIR = "${placeholder "out"}/lib/systemd/system";
40
40
+
41
41
+
doCheck = true;
38
42
39
43
enableParallelBuilding = true;
40
44