libmodulemd_1: drop
rpm-ostree now uses 2.0
This commit is contained in:
parent
508a132220
commit
6f22db6df1
@ -1,21 +0,0 @@
|
|||||||
{ libmodulemd, fetchurl }:
|
|
||||||
|
|
||||||
libmodulemd.overrideAttrs(old: rec {
|
|
||||||
name = "libmodulemd-${version}";
|
|
||||||
version = "1.8.15";
|
|
||||||
|
|
||||||
# Removes py output since there's no overrides here
|
|
||||||
outputs = [ "out" "devdoc" ];
|
|
||||||
|
|
||||||
patches = [
|
|
||||||
# Checks for glib docs in glib's prefix
|
|
||||||
# but they're installed to another
|
|
||||||
./dont-check-docs.patch
|
|
||||||
];
|
|
||||||
|
|
||||||
src = fetchurl {
|
|
||||||
url = "https://github.com/fedora-modularity/libmodulemd/releases/download/${name}/modulemd-${version}.tar.xz";
|
|
||||||
sha256 = "0gz8p3qzji3cx0r57sy3gn4dhigg4k7pcxj3lmjcjn13vxh5rm7z";
|
|
||||||
};
|
|
||||||
|
|
||||||
})
|
|
@ -1,29 +0,0 @@
|
|||||||
diff --git a/meson.build b/meson.build
|
|
||||||
index 155c9e7..9125372 100644
|
|
||||||
--- a/meson.build
|
|
||||||
+++ b/meson.build
|
|
||||||
@@ -60,15 +60,15 @@ sh = find_program('sh')
|
|
||||||
sed = find_program('sed')
|
|
||||||
test = find_program('test')
|
|
||||||
|
|
||||||
-ret = run_command ([test, '-e', join_paths(glib_docpath, 'glib/index.html')])
|
|
||||||
-if ret.returncode() != 0
|
|
||||||
- error('Missing documentation for GLib.')
|
|
||||||
-endif
|
|
||||||
-
|
|
||||||
-ret = run_command ([test, '-e', join_paths(glib_docpath, 'gobject/index.html')])
|
|
||||||
-if ret.returncode() != 0
|
|
||||||
- error('Missing documentation for GObject.')
|
|
||||||
-endif
|
|
||||||
+# ret = run_command ([test, '-e', join_paths(glib_docpath, 'glib/index.html')])
|
|
||||||
+# if ret.returncode() != 0
|
|
||||||
+# error('Missing documentation for GLib.')
|
|
||||||
+# endif
|
|
||||||
+
|
|
||||||
+# ret = run_command ([test, '-e', join_paths(glib_docpath, 'gobject/index.html')])
|
|
||||||
+# if ret.returncode() != 0
|
|
||||||
+# error('Missing documentation for GObject.')
|
|
||||||
+# endif
|
|
||||||
|
|
||||||
python_name = get_option('python_name')
|
|
||||||
|
|
@ -13587,7 +13587,6 @@ in
|
|||||||
libvdpau = callPackage ../development/libraries/libvdpau { };
|
libvdpau = callPackage ../development/libraries/libvdpau { };
|
||||||
|
|
||||||
libmodulemd = callPackage ../development/libraries/libmodulemd { };
|
libmodulemd = callPackage ../development/libraries/libmodulemd { };
|
||||||
libmodulemd_1 = callPackage ../development/libraries/libmodulemd/1.nix { };
|
|
||||||
|
|
||||||
libvdpau-va-gl = callPackage ../development/libraries/libvdpau-va-gl { };
|
libvdpau-va-gl = callPackage ../development/libraries/libvdpau-va-gl { };
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user