From d0878be870c0b4de898aa62de2ad43ef921c3b09 Mon Sep 17 00:00:00 2001 From: CrystalGamma Date: Tue, 20 Oct 2020 12:51:51 +0200 Subject: [PATCH] orc: 0.4.29 -> 0.4.32 * transition from name to pname + version * change the build system to meson, as autotools is no longer supported by upstream * optionally build devdoc output * whatever the reason for manipulating the pkgconfig, omitting it doesn't seem to break the build of orc or any of its direct reverse dependencies --- pkgs/development/compilers/orc/default.nix | 34 +++++++++++++--------- 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/pkgs/development/compilers/orc/default.nix b/pkgs/development/compilers/orc/default.nix index 34e79945f61..210aa786cdd 100644 --- a/pkgs/development/compilers/orc/default.nix +++ b/pkgs/development/compilers/orc/default.nix @@ -1,23 +1,31 @@ -{ stdenv, fetchurl }: - -stdenv.mkDerivation rec { - name = "orc-0.4.29"; +{ stdenv, fetchurl, meson, ninja +, gtk-doc ? null, file, docbook_xsl +, buildDevDoc ? gtk-doc != null +}: let + inherit (stdenv.lib) optional optionals; +in stdenv.mkDerivation rec { + pname = "orc"; + version = "0.4.32"; src = fetchurl { - url = "https://gstreamer.freedesktop.org/src/orc/${name}.tar.xz"; - sha256 = "1cisbbn69p9c8vikn0nin14q0zscby5m8cyvzxyw2pjb2kwh32ag"; + url = "https://gstreamer.freedesktop.org/src/orc/${pname}-${version}.tar.xz"; + sha256 = "1w0qmyj3v9sb2g7ff39pp38b9850y9hyy0bag26ifrby5f7ksvm6"; }; - outputs = [ "out" "dev" ]; + outputs = [ "out" "dev" ] + ++ optional buildDevDoc "devdoc" + ; outputBin = "dev"; # compilation tools - postInstall = '' - sed "/^toolsdir=/ctoolsdir=$dev/bin" -i "$dev"/lib/pkgconfig/orc*.pc - ''; + mesonFlags = + optional (!buildDevDoc) [ "-Dgtk_doc=disabled" ] + ; - # i686 https://gitlab.freedesktop.org/gstreamer/orc/issues/18 - # armv7l https://gitlab.freedesktop.org/gstreamer/orc/issues/9 - doCheck = (!stdenv.hostPlatform.isi686 && !stdenv.hostPlatform.isAarch32); + nativeBuildInputs = [ meson ninja ] + ++ optionals buildDevDoc [ gtk-doc file docbook_xsl ] + ; + + doCheck = true; meta = with stdenv.lib; { description = "The Oil Runtime Compiler";