Merge remote-tracking branch 'upstream/master' into HEAD

2 files changed, 7 insertions, 18 deletions

diff --git a/pkgs/desktops/gnome-3/3.24/misc/gpaste/default.nix b/pkgs/desktops/gnome-3/3.24/misc/gpaste/default.nix
index 2bfc6c73eb40..a43f9206cdd6 100644
--- a/pkgs/desktops/gnome-3/3.24/misc/gpaste/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/misc/gpaste/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, autoreconfHook, pkgconfig, vala_0_32, glib, gjs, mutter
-, pango, gtk3, gnome3, dbus, clutter, appstream-glib, makeWrapper, systemd, gobjectIntrospection }:
+{ stdenv, fetchurl, autoreconfHook, pkgconfig, vala, glib, gjs, mutter
+, pango, gtk3, gnome3, dbus, clutter, appstream-glib, wrapGAppsHook, systemd, gobjectIntrospection }:
 
 stdenv.mkDerivation rec {
   version = "3.24.2";
@@ -10,9 +10,10 @@ stdenv.mkDerivation rec {
     sha256 = "16142jfpkz8qfs7zp9k3c5l9pnvxbr5yygj8jdpx6by1142s6340";
   };
 
-  buildInputs = [ autoreconfHook pkgconfig vala_0_32 glib gjs mutter
+  nativeBuildInputs = [ autoreconfHook pkgconfig vala wrapGAppsHook ];
+  buildInputs = [ glib gjs mutter gnome3.adwaita-icon-theme
                   gtk3 gnome3.gnome_control_center dbus
-                  clutter pango appstream-glib makeWrapper systemd gobjectIntrospection ];
+                  clutter pango appstream-glib systemd gobjectIntrospection ];
 
   configureFlags = [ "--with-controlcenterdir=$(out)/gnome-control-center/keybindings"
                      "--with-dbusservicesdir=$(out)/share/dbus-1/services"
@@ -20,19 +21,6 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  preFixup =
-    let
-      libPath = stdenv.lib.makeLibraryPath
-        [ glib gtk3 clutter pango ];
-    in
-    ''
-      for i in $out/libexec/gpaste/*; do
-        wrapProgram $i \
-          --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \
-          --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH"
-      done
-    '';
-
   meta = with stdenv.lib; {
     homepage = https://github.com/Keruspe/GPaste;
     description = "Clipboard management system with GNOME3 integration";
diff --git a/pkgs/desktops/maxx/default.nix b/pkgs/desktops/maxx/default.nix
index c264593ff6bd..5797d6566a81 100644
--- a/pkgs/desktops/maxx/default.nix
+++ b/pkgs/desktops/maxx/default.nix
@@ -82,8 +82,9 @@ in stdenv.mkDerivation {
     description = "A replica of IRIX Interactive Desktop";
     homepage = http://www.maxxinteractive.com;
     license = {
+      fullName = "The MaXX Interactive Desktop for Linux License Agreement";
       url = http://www.maxxinteractive.com/site/?page_id=97;
-      free = true;
+      free = false; # redistribution is only allowed to *some* hardware, etc.
     };
     maintainers = [ maintainers.gnidorah ];
     platforms = ["x86_64-linux"];