diff options
author | Artturin <Artturin@artturin.com> | 2022-07-07 21:34:37 +0300 |
---|---|---|
committer | Artturin <Artturin@artturin.com> | 2022-07-08 03:56:47 +0300 |
commit | 1bd8727a4ca5cd4ed33a3e9349a42637f0f3a3bc (patch) | |
tree | 642b83508642481cce786f93793d57f65491f9cf /pkgs/development/libraries/pango/default.nix | |
parent | bf15263d1c87f64a86828786b54455fa1210036d (diff) | |
download | nixpkgs-1bd8727a4ca5cd4ed33a3e9349a42637f0f3a3bc.tar nixpkgs-1bd8727a4ca5cd4ed33a3e9349a42637f0f3a3bc.tar.gz nixpkgs-1bd8727a4ca5cd4ed33a3e9349a42637f0f3a3bc.tar.bz2 nixpkgs-1bd8727a4ca5cd4ed33a3e9349a42637f0f3a3bc.tar.lz nixpkgs-1bd8727a4ca5cd4ed33a3e9349a42637f0f3a3bc.tar.xz nixpkgs-1bd8727a4ca5cd4ed33a3e9349a42637f0f3a3bc.tar.zst nixpkgs-1bd8727a4ca5cd4ed33a3e9349a42637f0f3a3bc.zip |
various: enable gobject-introspection when cross-compiling
and fix cross in some
Diffstat (limited to 'pkgs/development/libraries/pango/default.nix')
-rw-r--r-- | pkgs/development/libraries/pango/default.nix | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix index 13dd24b5482..16db7be3135 100644 --- a/pkgs/development/libraries/pango/default.nix +++ b/pkgs/development/libraries/pango/default.nix @@ -16,26 +16,21 @@ , ninja , glib , python3 -, x11Support? !stdenv.isDarwin, libXft -, withIntrospection ? (stdenv.buildPlatform == stdenv.hostPlatform) , gobject-introspection -, withDocs ? (stdenv.buildPlatform == stdenv.hostPlatform) +, x11Support? !stdenv.isDarwin, libXft }: stdenv.mkDerivation rec { pname = "pango"; version = "1.50.7"; - outputs = [ "bin" "out" "dev" ] - ++ lib.optionals withDocs [ "devdoc" ]; + outputs = [ "bin" "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "BHfzaaPUxpXfcpmmmJ3ABHVqf03ifuysQFxnkLfjrTM="; }; - strictDeps = !withIntrospection; - depsBuildBuild = [ pkg-config ]; @@ -44,9 +39,7 @@ stdenv.mkDerivation rec { meson ninja glib # for glib-mkenum pkg-config - ] ++ lib.optionals withIntrospection [ gobject-introspection - ] ++ lib.optionals withDocs [ gi-docgen python3 ]; @@ -71,8 +64,7 @@ stdenv.mkDerivation rec { ]; mesonFlags = [ - "-Dgtk_doc=${lib.boolToString withDocs}" - "-Dintrospection=${if withIntrospection then "enabled" else "disabled"}" + "-Dgtk_doc=true" ] ++ lib.optionals (!x11Support) [ "-Dxft=disabled" # only works with x11 ]; @@ -82,9 +74,20 @@ stdenv.mkDerivation rec { fontDirectories = [ freefont_ttf ]; }; + # Run-time dependency gi-docgen found: NO (tried pkgconfig and cmake) + # it should be a build-time dep for build + # TODO: send upstream + postPatch = '' + substituteInPlace meson.build \ + --replace "dependency('gi-docgen', ver" "dependency('gi-docgen', native:true, ver" + + substituteInPlace docs/meson.build \ + --replace "'gi-docgen', req" "'gi-docgen', native:true, req" + ''; + doCheck = false; # test-font: FAIL - postFixup = lib.optionalString withDocs '' + postFixup = '' # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. moveToOutput "share/doc" "$devdoc" ''; |