summary refs log tree commit diff
diff options
context:
space:
mode:
authorJan Tojnar <jtojnar@gmail.com>2021-10-30 03:20:09 +0000
committerJan Tojnar <jtojnar@gmail.com>2021-10-30 05:34:25 +0200
commit4dde1d266c1d3eb956a7e6df764fd90b0cd70e6a (patch)
treef6aacc88c659a086036451eab1bd631d137f845a
parent2deb07f3ac4eeb5de1c12c4ba2911a2eb1f6ed61 (diff)
downloadnixpkgs-4dde1d266c1d3eb956a7e6df764fd90b0cd70e6a.tar
nixpkgs-4dde1d266c1d3eb956a7e6df764fd90b0cd70e6a.tar.gz
nixpkgs-4dde1d266c1d3eb956a7e6df764fd90b0cd70e6a.tar.bz2
nixpkgs-4dde1d266c1d3eb956a7e6df764fd90b0cd70e6a.tar.lz
nixpkgs-4dde1d266c1d3eb956a7e6df764fd90b0cd70e6a.tar.xz
nixpkgs-4dde1d266c1d3eb956a7e6df764fd90b0cd70e6a.tar.zst
nixpkgs-4dde1d266c1d3eb956a7e6df764fd90b0cd70e6a.zip
gfbgraph: 0.2.4 → 0.2.5
https://gitlab.gnome.org/GNOME/libgfbgraph/-/commits/v_0_2_5

Fixes CVE-2021-39358
-rw-r--r--pkgs/development/libraries/gfbgraph/default.nix54
1 files changed, 35 insertions, 19 deletions
diff --git a/pkgs/development/libraries/gfbgraph/default.nix b/pkgs/development/libraries/gfbgraph/default.nix
index 7f4625b6651..d84dd96ce2f 100644
--- a/pkgs/development/libraries/gfbgraph/default.nix
+++ b/pkgs/development/libraries/gfbgraph/default.nix
@@ -1,36 +1,52 @@
-{ lib, stdenv, fetchurl, pkg-config, glib, librest, gnome-online-accounts
-, gnome, libsoup, json-glib, gobject-introspection
-, gtk-doc, pkgs, docbook-xsl-nons, autoconf, automake, libtool }:
+{ stdenv
+, lib
+, fetchurl
+, pkg-config
+, glib
+, librest
+, gnome-online-accounts
+, gnome
+, libsoup
+, json-glib
+, gobject-introspection
+, gtk-doc
+, pkgs
+, docbook-xsl-nons
+}:
 
 stdenv.mkDerivation rec {
   pname = "gfbgraph";
-  version = "0.2.4";
+  version = "0.2.5";
 
   outputs = [ "out" "dev" "devdoc" ];
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0yck7dwvjk16a52nafjpi0a39rxwmg0w833brj45acz76lgkjrb0";
+    sha256 = "nLOBs/eLoRNt+Xrz8G47EdzCqzOawI907aD4BX1mA+M=";
   };
 
   nativeBuildInputs = [
-    pkg-config gobject-introspection gtk-doc
-    docbook-xsl-nons autoconf automake libtool
+    pkg-config
+    gobject-introspection
+    gtk-doc
+    docbook-xsl-nons
   ];
-  buildInputs = [ glib gnome-online-accounts ];
-  propagatedBuildInputs = [ libsoup json-glib librest ];
 
-  configureFlags = [ "--enable-introspection" "--enable-gtk-doc" ];
+  buildInputs = [
+    glib
+    gnome-online-accounts
+  ];
 
-  prePatch = ''
-    patchShebangs autogen.sh
-    substituteInPlace autogen.sh \
-      --replace "which" "${pkgs.which}/bin/which"
-  '';
+  propagatedBuildInputs = [
+    libsoup
+    json-glib
+    librest
+  ];
 
-  preConfigure = ''
-    NOCONFIGURE=1 ./autogen.sh
-  '';
+  configureFlags = [
+    "--enable-introspection"
+    "--enable-gtk-doc"
+  ];
 
   enableParallelBuilding = true;
 
@@ -45,7 +61,7 @@ stdenv.mkDerivation rec {
     homepage = "https://wiki.gnome.org/Projects/GFBGraph";
     description = "GLib/GObject wrapper for the Facebook Graph API";
     maintainers = teams.gnome.members;
-    license = licenses.lgpl2;
+    license = licenses.lgpl21Plus;
     platforms = platforms.linux;
   };
 }