From ab2278add6a152a845a890c2a483cd96c63d0171 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Fri, 9 Aug 2024 14:53:04 -0400 Subject: [PATCH] libpanel: fix cross compilation, enable strictDeps --- .../libraries/libpanel/default.nix | 47 +++++++++++-------- 1 file changed, 27 insertions(+), 20 deletions(-) diff --git a/pkgs/development/libraries/libpanel/default.nix b/pkgs/development/libraries/libpanel/default.nix index 55faa7e62860..416fe1b29e55 100644 --- a/pkgs/development/libraries/libpanel/default.nix +++ b/pkgs/development/libraries/libpanel/default.nix @@ -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; {