diff options
| author | worldofpeace <worldofpeace@protonmail.ch> | 2019-07-30 22:28:07 -0400 |
|---|---|---|
| committer | worldofpeace <worldofpeace@protonmail.ch> | 2019-08-18 04:23:17 -0400 |
| commit | 8fbae8c72defd1d325d7541456dce93c23f2cb73 (patch) | |
| tree | a0790a957c392dcafdf8bc6a969eac62d4a6e77b | |
| parent | fdd28981d782e6985ce9b962c907fd08ba84f5b0 (diff) | |
| download | nixpkgs-8fbae8c72defd1d325d7541456dce93c23f2cb73.tar nixpkgs-8fbae8c72defd1d325d7541456dce93c23f2cb73.tar.gz nixpkgs-8fbae8c72defd1d325d7541456dce93c23f2cb73.tar.bz2 nixpkgs-8fbae8c72defd1d325d7541456dce93c23f2cb73.tar.lz nixpkgs-8fbae8c72defd1d325d7541456dce93c23f2cb73.tar.xz nixpkgs-8fbae8c72defd1d325d7541456dce93c23f2cb73.tar.zst nixpkgs-8fbae8c72defd1d325d7541456dce93c23f2cb73.zip | |
libmodulemd_1: init at 1.8.15
| -rw-r--r-- | pkgs/development/libraries/libmodulemd/1.nix | 21 | ||||
| -rw-r--r-- | pkgs/development/libraries/libmodulemd/dont-check-docs.patch | 29 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 1 |
3 files changed, 51 insertions, 0 deletions
diff --git a/pkgs/development/libraries/libmodulemd/1.nix b/pkgs/development/libraries/libmodulemd/1.nix new file mode 100644 index 00000000000..174296375e0 --- /dev/null +++ b/pkgs/development/libraries/libmodulemd/1.nix @@ -0,0 +1,21 @@ +{ 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 new file mode 100644 index 00000000000..38ad5683692 --- /dev/null +++ b/pkgs/development/libraries/libmodulemd/dont-check-docs.patch @@ -0,0 +1,29 @@ +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') + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7c0bd13a2e8..512b20905dd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12347,6 +12347,7 @@ in libvdpau = callPackage ../development/libraries/libvdpau { }; libmodulemd = callPackage ../development/libraries/libmodulemd { }; + libmodulemd_1 = callPackage ../development/libraries/libmodulemd/1.nix { }; libvdpau-va-gl = callPackage ../development/libraries/libvdpau-va-gl { }; |