diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2020-06-19 00:24:08 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2020-06-19 00:31:28 +0200 |
| commit | 6f22db6df12ccf0c04e7245f817f9d94404bbb34 (patch) | |
| tree | 0bca7ae1a9aea91df717fb31057f9a49e9560ac7 /pkgs/development/libraries | |
| parent | 508a1322200c92db25423e4dd10a8649691a2b83 (diff) | |
| download | nixpkgs-6f22db6df12ccf0c04e7245f817f9d94404bbb34.tar nixpkgs-6f22db6df12ccf0c04e7245f817f9d94404bbb34.tar.gz nixpkgs-6f22db6df12ccf0c04e7245f817f9d94404bbb34.tar.bz2 nixpkgs-6f22db6df12ccf0c04e7245f817f9d94404bbb34.tar.lz nixpkgs-6f22db6df12ccf0c04e7245f817f9d94404bbb34.tar.xz nixpkgs-6f22db6df12ccf0c04e7245f817f9d94404bbb34.tar.zst nixpkgs-6f22db6df12ccf0c04e7245f817f9d94404bbb34.zip | |
libmodulemd_1: drop
rpm-ostree now uses 2.0
Diffstat (limited to 'pkgs/development/libraries')
| -rw-r--r-- | pkgs/development/libraries/libmodulemd/1.nix | 21 | ||||
| -rw-r--r-- | pkgs/development/libraries/libmodulemd/dont-check-docs.patch | 29 |
2 files changed, 0 insertions, 50 deletions
diff --git a/pkgs/development/libraries/libmodulemd/1.nix b/pkgs/development/libraries/libmodulemd/1.nix deleted file mode 100644 index 174296375e0..00000000000 --- a/pkgs/development/libraries/libmodulemd/1.nix +++ /dev/null @@ -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"; - }; - -}) diff --git a/pkgs/development/libraries/libmodulemd/dont-check-docs.patch b/pkgs/development/libraries/libmodulemd/dont-check-docs.patch deleted file mode 100644 index 38ad5683692..00000000000 --- a/pkgs/development/libraries/libmodulemd/dont-check-docs.patch +++ /dev/null @@ -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') - |