Merge pull request #146658 from 97nomad/nommy/fix-gigedit-pangomm

gigedit: use old pangomm version
This commit is contained in:
Alexander Bantyev 2021-11-19 22:58:40 +03:00 committed by GitHub
commit 1d1d332bb2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 69 additions and 3 deletions

View File

@ -1,7 +1,24 @@
{ lib, stdenv, fetchurl, autoconf, automake, intltool, libtool, pkg-config, which
, docbook_xml_dtd_45, docbook_xsl, gtkmm2, libgig, libsndfile, libxslt
{ lib
, stdenv
, fetchurl
, autoconf
, automake
, intltool
, libtool
, pkg-config
, which
, docbook_xml_dtd_45
, docbook_xsl
, gtkmm2
, pangomm_2_42
, libgig
, libsndfile
, libxslt
}:
let
gtkmm2_with_pango242 = gtkmm2.override { pangomm = pangomm_2_42; };
in
stdenv.mkDerivation rec {
pname = "gigedit";
version = "1.1.1";
@ -15,7 +32,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoconf automake intltool libtool pkg-config which ];
buildInputs = [ docbook_xml_dtd_45 docbook_xsl gtkmm2 libgig libsndfile libxslt ];
buildInputs = [ docbook_xml_dtd_45 docbook_xsl gtkmm2_with_pango242 libgig libsndfile libxslt ];
enableParallelBuilding = true;

View File

@ -0,0 +1,45 @@
{ lib, stdenv, fetchurl, pkg-config, meson, ninja, python3, pango, glibmm, cairomm, gnome
, ApplicationServices }:
stdenv.mkDerivation rec {
pname = "pangomm";
version= "2.42.2";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "sha256-GyTJJiSuEnXMtXdYF10198Oa0zQtjAtLpg8NmEnS0Io=";
};
outputs = [ "out" "dev" ];
nativeBuildInputs = [ pkg-config meson ninja python3 ] ++ lib.optionals stdenv.isDarwin [
ApplicationServices
];
propagatedBuildInputs = [ pango glibmm cairomm ];
doCheck = true;
passthru = {
updateScript = gnome.updateScript {
packageName = pname;
versionPolicy = "odd-unstable";
freeze = true;
};
};
meta = with lib; {
description = "C++ interface to the Pango text rendering library";
homepage = "https://www.pango.org/";
license = with licenses; [ lgpl2 lgpl21 ];
maintainers = with maintainers; [ lovek323 raskin ];
platforms = platforms.unix;
longDescription = ''
Pango is a library for laying out and rendering of text, with an
emphasis on internationalization. Pango can be used anywhere
that text layout is needed, though most of the work on Pango so
far has been done in the context of the GTK widget toolkit.
Pango forms the core of text and font handling for GTK.
'';
};
}

View File

@ -16729,6 +16729,10 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) ApplicationServices;
};
pangomm_2_42 = callPackage ../development/libraries/pangomm/2.42.nix {
inherit (darwin.apple_sdk.frameworks) ApplicationServices;
};
gdata-sharp = callPackage ../development/libraries/gdata-sharp { };
gdk-pixbuf = callPackage ../development/libraries/gdk-pixbuf { };