Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 96fb471fc76e
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: d0878be870c0
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Nov 18, 2020

  1. 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
    @FRidh
    CrystalGamma authored and FRidh committed Nov 18, 2020
    Copy the full SHA
    d0878be View commit details
Showing with 21 additions and 13 deletions.
  1. +21 −13 pkgs/development/compilers/orc/default.nix
34 changes: 21 additions & 13 deletions pkgs/development/compilers/orc/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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" ]
;

nativeBuildInputs = [ meson ninja ]
++ optionals buildDevDoc [ gtk-doc file docbook_xsl ]
;

# 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);
doCheck = true;

meta = with stdenv.lib; {
description = "The Oil Runtime Compiler";