From 4a30fc25228a02d3aa3bf374b1643a400433cb39 Mon Sep 17 00:00:00 2001 From: davidak Date: Tue, 8 May 2018 01:36:33 +0200 Subject: [PATCH 1/3] bamf: init at 0.5.3 --- pkgs/development/libraries/bamf/default.nix | 49 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 51 insertions(+) create mode 100644 pkgs/development/libraries/bamf/default.nix diff --git a/pkgs/development/libraries/bamf/default.nix b/pkgs/development/libraries/bamf/default.nix new file mode 100644 index 00000000000..dd926ac2081 --- /dev/null +++ b/pkgs/development/libraries/bamf/default.nix @@ -0,0 +1,49 @@ +{ stdenv, fetchurl, libgtop, libwnck3, glib, vala, pkgconfig +, libstartup_notification, gobjectIntrospection, gtk-doc +, python27, pythonPackages, libxml2 }: + +stdenv.mkDerivation rec { + pname = "bamf"; + version = "0.5.3"; + name = "${pname}-${version}"; + + src = fetchurl { + url = "https://launchpad.net/${pname}/0.5/${version}/+download/${name}.tar.gz"; + sha256 = "051vib8ndp09ph5bfwkgmzda94varzjafwxf6lqx7z1s8rd7n39l"; + }; + + nativeBuildInputs = [ + pkgconfig + gtk-doc + gobjectIntrospection + ]; + + buildInputs = [ libgtop libwnck3 vala libstartup_notification + python27 pythonPackages.libxslt libxml2 glib ]; + + postPatch = '' + substituteInPlace data/Makefile.in \ + --replace '/usr/lib/systemd/user' '@datarootdir@/systemd/user' + ''; + + # fix paths + makeFlags = [ + "INTROSPECTION_GIRDIR=$(out)/share/gir-1.0/" + "INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0" + ]; + + # ignore deprecation errors + NIX_CFLAGS_COMPILE = "-Wno-deprecated-declarations"; + + meta = with stdenv.lib; { + description = "Application matching framework"; + longDescription = '' + Removes the headache of applications matching + into a simple DBus daemon and c wrapper library. + ''; + homepage = https://launchpad.net/bamf; + license = licenses.lgpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ davidak ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3d0b125b8a2..a654d197d3c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8527,6 +8527,8 @@ with pkgs; backward-cpp = callPackage ../development/libraries/backward-cpp { }; + bamf = callPackage ../development/libraries/bamf { }; + bctoolbox = callPackage ../development/libraries/bctoolbox { mbedtls = mbedtls_1_3; }; From 296e7717e0be6d45ce5da17d4d42d81f9647b6d5 Mon Sep 17 00:00:00 2001 From: davidak Date: Tue, 8 May 2018 01:36:59 +0200 Subject: [PATCH 2/3] plank: init at 0.11.4 --- pkgs/applications/misc/plank/default.nix | 47 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 49 insertions(+) create mode 100644 pkgs/applications/misc/plank/default.nix diff --git a/pkgs/applications/misc/plank/default.nix b/pkgs/applications/misc/plank/default.nix new file mode 100644 index 00000000000..3e69f4a97c1 --- /dev/null +++ b/pkgs/applications/misc/plank/default.nix @@ -0,0 +1,47 @@ +{ stdenv, fetchurl, vala, atk, cairo, glib, gnome3, gtk3, libwnck3 +, libX11, libXfixes, libXi, pango, intltool, pkgconfig, libxml2 +, bamf, gdk_pixbuf, libdbusmenu-gtk3, file +, wrapGAppsHook, gobjectIntrospection }: + +stdenv.mkDerivation rec { + pname = "plank"; + version = "0.11.4"; + name = "${pname}-${version}"; + + src = fetchurl { + url = "https://launchpad.net/${pname}/1.0/${version}/+download/${name}.tar.xz"; + sha256 = "1f41i45xpqhjxql9nl4a1sz30s0j46aqdhbwbvgrawz6himcvdc8"; + }; + + nativeBuildInputs = [ + pkgconfig + intltool + libxml2 # xmllint + wrapGAppsHook + gobjectIntrospection + ]; + + buildInputs = [ vala atk cairo glib gnome3.gnome-menus + gtk3 gnome3.libgee libwnck3 libX11 libXfixes + libXi pango gnome3.gnome-common bamf gdk_pixbuf + libdbusmenu-gtk3 gnome3.dconf ]; + + # fix paths + makeFlags = [ + "INTROSPECTION_GIRDIR=$(out)/share/gir-1.0/" + "INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0" + ]; + + postPatch = '' + substituteInPlace ./configure \ + --replace "/usr/bin/file" "${file}/bin/file" + ''; + + meta = with stdenv.lib; { + description = "Elegant, simple, clean dock"; + homepage = https://launchpad.net/plank; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ davidak ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a654d197d3c..8bdb6666e3f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17088,6 +17088,8 @@ with pkgs; pijul = callPackage ../applications/version-management/pijul {}; + plank = callPackage ../applications/misc/plank { }; + planner = callPackage ../applications/office/planner { }; playonlinux = callPackage ../applications/misc/playonlinux { From 2f9fd6ff591ff6d1ef43492b4524ee5894c20c4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 10 May 2018 12:16:39 +0100 Subject: [PATCH 3/3] plank: add autoreconfHook --- pkgs/applications/misc/plank/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/plank/default.nix b/pkgs/applications/misc/plank/default.nix index 3e69f4a97c1..46e26666b40 100644 --- a/pkgs/applications/misc/plank/default.nix +++ b/pkgs/applications/misc/plank/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, vala, atk, cairo, glib, gnome3, gtk3, libwnck3 , libX11, libXfixes, libXi, pango, intltool, pkgconfig, libxml2 , bamf, gdk_pixbuf, libdbusmenu-gtk3, file -, wrapGAppsHook, gobjectIntrospection }: +, wrapGAppsHook, autoreconfHook, gobjectIntrospection }: stdenv.mkDerivation rec { pname = "plank"; @@ -19,6 +19,7 @@ stdenv.mkDerivation rec { libxml2 # xmllint wrapGAppsHook gobjectIntrospection + autoreconfHook ]; buildInputs = [ vala atk cairo glib gnome3.gnome-menus