Merge pull request #44471 from worldofpeace/elementary-requesites

Various elementary necessaries

pkgs/development/libraries/appstream/default.nix

@@ -1,36 +1,27 @@
 { stdenv, fetchpatch, fetchFromGitHub, meson, ninja, pkgconfig, gettext
 , xmlto, docbook_xsl, docbook_xml_dtd_45, libxslt
 , libstemmer, glib, xapian, libxml2, libyaml, gobjectIntrospection
-, pcre, itstool
+, pcre, itstool, gperf, vala
 }:
 
 stdenv.mkDerivation rec {
   name = "appstream-${version}";
-  version = "0.11.8";
+  version = "0.12.2";
 
   src = fetchFromGitHub {
     owner  = "ximion";
     repo   = "appstream";
     rev    = "APPSTREAM_${stdenv.lib.replaceStrings ["."] ["_"] version}";
-    sha256 = "07vzz57g1p5byj2jfg17y5n3il0g07d9wkiynzwra71mcxar1p08";
+    sha256 = "1g15c4bhyl730rgaiqia3jppraixh05c3yx098lyilidbddxp5xb";
   };
 
-  patches = [
-    # drop this in version 0.11.9 and above
-    (fetchpatch {
-      name   = "define-location-and-soname.patch";
-      url    = "https://github.com/ximion/appstream/commit/3e58f9c9.patch";
-      sha256 = "1ffgbdfg80yq5vahjrvdd4f8xsp32ksm9vyasfmc7hzhx294s78w";
-    })
-  ];
-
   nativeBuildInputs = [
     meson ninja pkgconfig gettext
     libxslt xmlto docbook_xsl docbook_xml_dtd_45
-    gobjectIntrospection itstool
+    gobjectIntrospection itstool vala
   ];
 
-  buildInputs = [ libstemmer pcre glib xapian libxml2 libyaml ];
+  buildInputs = [ libstemmer pcre glib xapian libxml2 libyaml gperf ];
 
   prePatch = ''
     substituteInPlace meson.build \
@@ -43,7 +34,7 @@ stdenv.mkDerivation rec {
   mesonFlags = [
     "-Dapidocs=false"
     "-Ddocs=false"
-    "-Dgir=false"
+    "-Dvapi=true"
   ];
 
   meta = with stdenv.lib; {

pkgs/development/libraries/appstream/qt.nix

@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   name = "appstream-qt-${version}";
-  inherit (appstream) version src patches prePatch;
+  inherit (appstream) version src prePatch;
 
   buildInputs = appstream.buildInputs ++ [ appstream qtbase ];
 

pkgs/development/libraries/libunity/default.nix

@@ -0,0 +1,53 @@
+{ stdenv, fetchurl, pkgconfig, automake, autoconf, libtool
+, glib, vala, dee, gobjectIntrospection, libdbusmenu-glib
+, gtk3, intltool, gnome-common, python3, icu }:
+
+stdenv.mkDerivation rec {
+  pname = "libunity";
+  version = "7.1.4";
+
+  name = "${pname}-${version}";
+
+  outputs = [ "out" "dev" ];
+
+  src = fetchurl {
+    url = "https://launchpad.net/ubuntu/+archive/primary/+files/${pname}_${version}+15.10.20151002.orig.tar.gz";
+    sha256 = "1sf98qcjkxfibxk03firnc12dm6il8jzaq5763qam8ydg4li4gij";
+  };
+
+  nativeBuildInputs = [
+    autoconf
+    automake
+    gnome-common
+    gobjectIntrospection
+    intltool
+    libtool
+    pkgconfig
+    python3
+    vala
+  ];
+
+  buildInputs = [
+    glib
+    gtk3
+  ];
+
+  propagatedBuildInputs = [ dee libdbusmenu-glib ];
+
+  preConfigure = "NOCONFIGURE=1 ./autogen.sh";
+
+  configureFlags = [
+    "--disable-static"
+    "--with-pygi-overrides-dir=$(out)/${python3.sitePackages}/gi/overrides"
+  ];
+
+  NIX_LDFLAGS = "-L${icu}/lib";
+
+  meta = with stdenv.lib; {
+    description = "A library for instrumenting and integrating with all aspects of the Unity shell";
+    homepage = https://launchpad.net/libunity;
+    license = licenses.lgpl3;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ worldofpeace ];
+  };
+}

pkgs/tools/graphics/scour/default.nix

@@ -0,0 +1,23 @@
+{ stdenv, python3 }:
+
+with python3.pkgs;
+
+buildPythonApplication rec {
+  pname = "scour";
+  version = "0.37";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "05k1f8i8v7sp5v39lian865vwvapq05a6vmvk7fwnxv8kivi6ccn";
+  };
+
+  propagatedBuildInputs = [ six ];
+
+  meta = with stdenv.lib; {
+    description = "An SVG Optimizer / Cleaner ";
+    homepage    = https://github.com/scour-project/scour;
+    license     = licenses.asl20;
+    maintainers = with maintainers; [ worldofpeace ];
+    platforms   = platforms.unix;
+  };
+}

pkgs/top-level/all-packages.nix

@@ -1456,6 +1456,8 @@ with pkgs;
 
   parallel-rust = callPackage ../tools/misc/parallel-rust { };
 
+  scour = callPackage ../tools/graphics/scour { };
+
   s2png = callPackage ../tools/graphics/s2png { };
 
   simg2img = callPackage ../tools/filesystems/simg2img { };
@@ -10101,6 +10103,10 @@ with pkgs;
 
   libdbiDrivers = callPackage ../development/libraries/libdbi-drivers { };
 
+  libunity = callPackage ../development/libraries/libunity {
+    inherit (gnome3) gnome-common;
+  };
+
   libdbusmenu = callPackage ../development/libraries/libdbusmenu { };
   libdbusmenu-gtk2 = libdbusmenu.override { gtkVersion = "2"; };
   libdbusmenu-gtk3 = libdbusmenu.override { gtkVersion = "3"; };