JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #80837 from zowoq/ostree-2020-2

Browse Source 
ostree: 2019.6 -> 2020.2
This commit is contained in:
Jan Tojnar 2020-02-24 20:56:53 +01:00 committed by GitHub
commit 7fb671e43e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pkgs/tools/misc/ostree/default.nix
View File

@ -37,13 +37,13 @@ let
])); ]));
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
pname = "ostree"; pname = "ostree";
version = "2019.6"; version = "2020.2";
outputs = [ "out" "dev" "man" "installedTests" ]; outputs = [ "out" "dev" "man" "installedTests" ];
src = fetchurl { src = fetchurl {
url = "https://github.com/ostreedev/ostree/releases/download/v${version}/libostree-${version}.tar.xz"; url = "https://github.com/ostreedev/ostree/releases/download/v${version}/libostree-${version}.tar.xz";
sha256 = "1bhrfbjna3rnymijxagzkdq2zl74g71s2xmimihjhvcw2zybi0jl"; sha256 = "0bbk0sg4m38g7j00hy358p2azxas87minpgz3avwma6jsylj1qjg";
}; };
patches = [ patches = [
@ -52,12 +52,6 @@ in stdenv.mkDerivation rec {
# Patch from https://github.com/ostreedev/ostree/pull/1633 # Patch from https://github.com/ostreedev/ostree/pull/1633
./01-Drop-ostree-trivial-httpd-CLI-move-to-tests-director.patch ./01-Drop-ostree-trivial-httpd-CLI-move-to-tests-director.patch
# Fix tests running in Catalan instead of C locale.
(fetchpatch {
url = "https://github.com/ostreedev/ostree/commit/5135a1e58ade2bfafc8c1fda359540eafd72531e.patch";
sha256 = "1crzaagw1zzx8v6rsnxb9jnc3ij9hlpvdl91w3skqdm28adx7yx8";
})
# Workarounds for https://github.com/ostreedev/ostree/issues/1592 # Workarounds for https://github.com/ostreedev/ostree/issues/1592
./fix-1592.patch ./fix-1592.patch
@ -119,9 +113,14 @@ in stdenv.mkDerivation rec {
"installed_test_metadir=${placeholder "installedTests"}/share/installed-tests/libostree" "installed_test_metadir=${placeholder "installedTests"}/share/installed-tests/libostree"
]; ];
postFixup = '' postFixup = let
typelibPath = stdenv.lib.makeSearchPath "/lib/girepository-1.0" [
(placeholder "out")
gobject-introspection
];
in ''
for test in $installedTests/libexec/installed-tests/libostree/*.js; do for test in $installedTests/libexec/installed-tests/libostree/*.js; do
wrapProgram "$test" --prefix GI_TYPELIB_PATH : "$out/lib/girepository-1.0" wrapProgram "$test" --prefix GI_TYPELIB_PATH : "${typelibPath}"
done done
''; '';