git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #80837 from zowoq/ostree-2020-2

ostree: 2019.6 -> 2020.2

commit7fb671e43e74b28d0db12c71a03977a9cd760c4e authorJan Tojnar <jtojnar@gmail.com> dateMon 24 Feb 2020, 20:56 (7 years ago) parent9532ca326bd210
1 file changed+9−10
pkgs/tools/misc/ostree/default.nix+9−10
pkgs/tools/misc/ostree/default.nix+9−10
@@ -37,13 +37,13 @@ let
3737 ]));
3838in stdenv.mkDerivation rec {
3939 pname = "ostree";
40− version = "2019.6";
40+ version = "2020.2";
4141
4242 outputs = [ "out" "dev" "man" "installedTests" ];
4343
4444 src = fetchurl {
4545 url = "https://github.com/ostreedev/ostree/releases/download/v${version}/libostree-${version}.tar.xz";
46− sha256 = "1bhrfbjna3rnymijxagzkdq2zl74g71s2xmimihjhvcw2zybi0jl";
46+ sha256 = "0bbk0sg4m38g7j00hy358p2azxas87minpgz3avwma6jsylj1qjg";
4747 };
4848
4949 patches = [
@@ -52,12 +52,6 @@ in stdenv.mkDerivation rec {
5252 # Patch from https://github.com/ostreedev/ostree/pull/1633
5353 ./01-Drop-ostree-trivial-httpd-CLI-move-to-tests-director.patch
5454
55− # Fix tests running in Catalan instead of C locale.
56− (fetchpatch {
57− url = "https://github.com/ostreedev/ostree/commit/5135a1e58ade2bfafc8c1fda359540eafd72531e.patch";
58− sha256 = "1crzaagw1zzx8v6rsnxb9jnc3ij9hlpvdl91w3skqdm28adx7yx8";
59− })
60−
6155 # Workarounds for https://github.com/ostreedev/ostree/issues/1592
6256 ./fix-1592.patch
6357
@@ -119,9 +113,14 @@ in stdenv.mkDerivation rec {
119113 "installed_test_metadir=${placeholder "installedTests"}/share/installed-tests/libostree"
120114 ];
121115
122− postFixup = ''
116+ postFixup = let
117+ typelibPath = stdenv.lib.makeSearchPath "/lib/girepository-1.0" [
118+ (placeholder "out")
119+ gobject-introspection
120+ ];
121+ in ''
123122 for test in $installedTests/libexec/installed-tests/libostree/*.js; do
124− wrapProgram "$test" --prefix GI_TYPELIB_PATH : "$out/lib/girepository-1.0"
123+ wrapProgram "$test" --prefix GI_TYPELIB_PATH : "${typelibPath}"
125124 done
126125 '';
127126