tjh.dev
ostree: 2018.9 → 2019.1
+11
-36
pkgs/tools/misc/ostree/default.nix
+11
-36
pkgs/tools/misc/ostree/default.nix
···
1
-
{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, gtk-doc, gobject-introspection, gnome3
1
+
{ stdenv, fetchurl, fetchpatch, pkgconfig, gtk-doc, gobject-introspection, gnome3
2
2
, glib, systemd, xz, e2fsprogs, libsoup, gpgme, which, autoconf, automake, libtool, fuse, utillinuxMinimal, libselinux
3
3
, libarchive, libcap, bzip2, yacc, libxslt, docbook_xsl, docbook_xml_dtd_42, python3
4
4
}:
5
5
6
-
let
7
-
version = "2018.9";
8
-
9
-
libglnx-src = fetchFromGitHub {
10
-
owner = "GNOME";
11
-
repo = "libglnx";
12
-
rev = "470af8763ff7b99bec950a6ae0a957c1dcfc8edd";
13
-
sha256 = "1fwik38i6w3r6pn4qkizradcqp1m83n7ljh9jg0y3p3kvrbfxh15";
14
-
};
15
-
16
-
bsdiff-src = fetchFromGitHub {
17
-
owner = "mendsley";
18
-
repo = "bsdiff";
19
-
rev = "1edf9f656850c0c64dae260960fabd8249ea9c60";
20
-
sha256 = "1h71d2h2d3anp4msvpaff445rnzdxii3id2yglqk7af9i43kdsn1";
21
-
};
22
-
in stdenv.mkDerivation {
23
-
name = "ostree-${version}";
6
+
stdenv.mkDerivation rec {
7
+
pname = "ostree";
8
+
version = "2019.1";
24
9
25
10
outputs = [ "out" "dev" "man" "installedTests" ];
26
11
27
-
src = fetchFromGitHub {
28
-
rev = "v${version}";
29
-
owner = "ostreedev";
30
-
repo = "ostree";
31
-
sha256 = "0a8gr4qqxcvz3fqv9w4dxy6iq0rq4kdzf08rzv8xg4gic3ldgyvj";
12
+
src = fetchurl {
13
+
url = "https://github.com/ostreedev/ostree/releases/download/v${version}/libostree-${version}.tar.xz";
14
+
sha256 = "08y7nsxl305dnlfak4kyj88lld848y4kg6bvjqngcxaqqvkk9xqm";
32
15
};
33
16
34
17
patches = [
···
57
40
(python3.withPackages (p: with p; [ pyyaml ])) gnome3.gjs # for tests
58
41
];
59
42
60
-
prePatch = ''
61
-
rmdir libglnx bsdiff
62
-
cp --no-preserve=mode -r ${libglnx-src} libglnx
63
-
cp --no-preserve=mode -r ${bsdiff-src} bsdiff
64
-
'';
65
-
66
-
67
43
preConfigure = ''
68
44
env NOCONFIGURE=1 ./autogen.sh
69
45
'';
···
71
47
enableParallelBuilding = true;
72
48
73
49
configureFlags = [
74
-
"--with-systemdsystemunitdir=$(out)/lib/systemd/system"
75
-
"--with-systemdsystemgeneratordir=$(out)/lib/systemd/system-generators"
50
+
"--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system"
51
+
"--with-systemdsystemgeneratordir=${placeholder "out"}/lib/systemd/system-generators"
76
52
"--enable-installed-tests"
77
53
];
78
54
79
55
makeFlags = [
80
-
"installed_testdir=$(installedTests)/libexec/installed-tests/libostree"
81
-
"installed_test_metadir=$(installedTests)/share/installed-tests/libostree"
56
+
"installed_testdir=${placeholder "installedTests"}/libexec/installed-tests/libostree"
57
+
"installed_test_metadir=${placeholder "installedTests"}/share/installed-tests/libostree"
82
58
];
83
-
84
59
85
60
meta = with stdenv.lib; {
86
61
description = "Git for operating system binaries";