From 4b577494fd9c74a3fdca082bdd2f9445fb04a49c Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 25 Feb 2023 01:59:18 +0100 Subject: [PATCH] libgee: clean up - format the expression (one dependency per line) - re-order the expression - use finalAttrs - shove environment variables to env --- pkgs/development/libraries/libgee/default.nix | 39 ++++++++++++++----- 1 file changed, 29 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/libgee/default.nix b/pkgs/development/libraries/libgee/default.nix index cec611f366c..7863235e021 100644 --- a/pkgs/development/libraries/libgee/default.nix +++ b/pkgs/development/libraries/libgee/default.nix @@ -1,27 +1,46 @@ -{ lib, stdenv, fetchurl, autoconf, vala, pkg-config, glib, gobject-introspection, gnome }: +{ stdenv +, lib +, fetchurl +, autoconf +, vala +, pkg-config +, glib +, gobject-introspection +, gnome +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libgee"; version = "0.20.6"; outputs = [ "out" "dev" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/libgee/${lib.versions.majorMinor finalAttrs.version}/libgee-${finalAttrs.version}.tar.xz"; sha256 = "G/g09eENYMxhJNdO08HdONpkZ4f794ciILi0Bo5HbU0="; }; + nativeBuildInputs = [ + pkg-config + autoconf + vala + gobject-introspection + ]; + + buildInputs = [ + glib + ]; + doCheck = true; - nativeBuildInputs = [ pkg-config autoconf vala gobject-introspection ]; - buildInputs = [ glib ]; - - PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR = "${placeholder "dev"}/share/gir-1.0"; - PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_TYPELIBDIR = "${placeholder "out"}/lib/girepository-1.0"; + env = { + PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR = "${placeholder "dev"}/share/gir-1.0"; + PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_TYPELIBDIR = "${placeholder "out"}/lib/girepository-1.0"; + }; passthru = { updateScript = gnome.updateScript { - packageName = pname; + packageName = "libgee"; versionPolicy = "odd-unstable"; }; }; @@ -33,4 +52,4 @@ stdenv.mkDerivation rec { platforms = platforms.unix; maintainers = teams.gnome.members; }; -} +})