Merge pull request #333563 from NickCao/libpanel

libpanel: fix cross compilation, enable strictDeps
This commit is contained in:
Jan Tojnar
2024-08-10 23:54:23 +02:00
committed by GitHub
+27 -20
View File
@@ -1,23 +1,29 @@
{ stdenv
, lib
, fetchurl
, meson
, ninja
, pkg-config
, gobject-introspection
, vala
, gi-docgen
, glib
, gtk4
, libadwaita
, gnome
{
stdenv,
lib,
fetchurl,
meson,
ninja,
pkg-config,
gobject-introspection,
vala,
gi-docgen,
glib,
gtk4,
libadwaita,
gnome,
}:
stdenv.mkDerivation rec {
pname = "libpanel";
version = "1.6.0";
outputs = [ "out" "dev" "devdoc" ];
outputs = [
"out"
"dev"
"devdoc"
];
outputBin = "dev";
src = fetchurl {
@@ -25,6 +31,10 @@ stdenv.mkDerivation rec {
hash = "sha256-t3NJSjxpMANFzY4nAnRI0RiRgwJswTeAL4hkF8bqMLY=";
};
strictDeps = true;
depsBuildBuild = [ pkg-config ];
nativeBuildInputs = [
meson
ninja
@@ -32,6 +42,7 @@ stdenv.mkDerivation rec {
gobject-introspection
vala
gi-docgen
gtk4 # gtk4-update-icon-cache
];
buildInputs = [
@@ -40,9 +51,7 @@ stdenv.mkDerivation rec {
libadwaita
];
mesonFlags = [
"-Dinstall-examples=true"
];
mesonFlags = [ (lib.mesonBool "install-examples" true) ];
postFixup = ''
# Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back.
@@ -50,9 +59,7 @@ stdenv.mkDerivation rec {
'';
passthru = {
updateScript = gnome.updateScript {
packageName = pname;
};
updateScript = gnome.updateScript { packageName = pname; };
};
meta = with lib; {