Merge master into staging-next

5 files changed, 66 insertions, 13 deletions

diff --git a/pkgs/misc/gnash/default.nix b/pkgs/misc/gnash/default.nix
index 8aeabebbefea..db2afa5ba631 100644
--- a/pkgs/misc/gnash/default.nix
+++ b/pkgs/misc/gnash/default.nix
@@ -15,9 +15,6 @@
 
 # media
 , enableFFmpeg    ? true,  ffmpeg_2 ? null
-, enableGstreamer ? false, gst-plugins-base ? null
-                         , gst-plugins-ugly ? null
-                         , gst-ffmpeg ? null
 
 # misc
 , enableJemalloc ? true, jemalloc  ? null
@@ -31,8 +28,7 @@ let
   available = x: x != null;
 
   sound =
-    if enableFFmpeg    then "ffmpeg" else
-    if enableGstreamer then "gst"    else "none";
+    if enableFFmpeg then "ffmpeg" else "none";
 
   renderers = []
     ++ optional enableAGG    "agg"
@@ -58,7 +54,6 @@ assert enableQt  -> available qt4;
 
 # media libraries
 assert enableFFmpeg    -> available ffmpeg_2 ;
-assert enableGstreamer -> all available [ gst-plugins-base gst-plugins-ugly gst-ffmpeg ];
 
 # misc
 assert enableJemalloc -> available jemalloc;
@@ -96,8 +91,7 @@ stdenv.mkDerivation rec {
     ++ optional  enableJemalloc  jemalloc
     ++ optional  enableHwAccel   libGLU_combined
     ++ optionals enablePlugins   [ xulrunner npapi_sdk ]
-    ++ optionals enableGTK       [ gtk2 gnome2.gtkglext gnome2.GConf ]
-    ++ optionals enableGstreamer [ gst-plugins-base gst-plugins-ugly gst-ffmpeg ];
+    ++ optionals enableGTK       [ gtk2 gnome2.gtkglext gnome2.GConf ];
 
   configureFlags = with stdenv.lib; [
     "--with-boost-incl=${boost.dev}/include"
diff --git a/pkgs/misc/themes/obsidian2/default.nix b/pkgs/misc/themes/obsidian2/default.nix
index 571639a99014..8a8e88ff6f96 100644
--- a/pkgs/misc/themes/obsidian2/default.nix
+++ b/pkgs/misc/themes/obsidian2/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "theme-obsidian2-${version}";
-  version = "2.7";
+  version = "2.8";
 
   src = fetchFromGitHub {
     owner = "madmaxms";
     repo = "theme-obsidian-2";
     rev = "v${version}";
-    sha256 = "0my3q7xvi6m257x489wync0y5n8n1kig4xg5gfrb905avhxj5frs";
+    sha256 = "0qryqpyxbhr0kyar2cshwhzv4da6rfz9gi4wjb6xvcb6szxhlcaq";
   };
 
   propagatedUserEnvPkgs = [ gtk-engine-murrine ];
diff --git a/pkgs/misc/themes/qtcurve/default.nix b/pkgs/misc/themes/qtcurve/default.nix
new file mode 100644
index 000000000000..54715c01a9ee
--- /dev/null
+++ b/pkgs/misc/themes/qtcurve/default.nix
@@ -0,0 +1,51 @@
+{ stdenv, fetchurl, cmake, extra-cmake-modules, pkgconfig
+, gtk2, qtbase, qtsvg, qtx11extras # Toolkit dependencies
+, karchive, kconfig, kconfigwidgets, kio, frameworkintegration
+, kguiaddons, ki18n, kwindowsystem, kdelibs4support, kiconthemes
+, libpthreadstubs, pcre, libXdmcp, libX11, libXau # X11 dependencies
+}:
+
+let
+  version = "1.9";
+in stdenv.mkDerivation {
+  name = "qtcurve-${version}";
+  src = fetchurl {
+    url = "http://download.kde.org/stable/qtcurve/qtcurve-${version}.tar.xz";
+    sha256 = "169gdny1cdld0qnx3nqvx568zjzdba4pwp3gxapc1hdh2cymw7r8";
+  };
+
+  enableParallelBuilding = true;
+
+  nativeBuildInputs = [ cmake extra-cmake-modules pkgconfig ];
+
+  buildInputs = [
+    gtk2
+    qtbase qtsvg qtx11extras
+    karchive kconfig kconfigwidgets kio kiconthemes kguiaddons ki18n
+    kwindowsystem kdelibs4support frameworkintegration
+    libpthreadstubs
+    pcre
+    libXdmcp libX11 libXau
+  ];
+
+  preConfigure = ''
+    for i in qt5/CMakeLists.txt qt5/config/CMakeLists.txt
+    do
+      substituteInPlace $i \
+        --replace "{_Qt5_PLUGIN_INSTALL_DIR}" "{KDE_INSTALL_QTPLUGINDIR}"
+    done
+    substituteInPlace CMakeLists.txt \
+      --replace \$\{GTK2_PREFIX\} $out
+    substituteInPlace gtk2/style/CMakeLists.txt \
+      --replace \$\{GTK2_LIBDIR\} $out/lib
+    patchShebangs tools/gen-version.sh
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/QtCurve/qtcurve;
+    description = "Widget styles for Qt5/Plasma 5 and gtk2";
+    platforms = platforms.linux;
+    license = licenses.lgpl21Plus;
+    maintainers = [ maintainers.gnidorah ];
+  };
+}
diff --git a/pkgs/misc/tmux-plugins/default.nix b/pkgs/misc/tmux-plugins/default.nix
index fb95b667d864..2e269e185e4d 100644
--- a/pkgs/misc/tmux-plugins/default.nix
+++ b/pkgs/misc/tmux-plugins/default.nix
@@ -1,4 +1,9 @@
-{ fetchgit, stdenv, pkgs }:
+{ fetchgit
+, lib
+, pkgs
+, reattach-to-user-namespace
+, stdenv
+}:
 
 let
   rtpPath = "share/tmux-plugins";
@@ -187,6 +192,9 @@ in rec {
       rev = "e91b178ff832b7bcbbf4d99d9f467f63fd1b76b5";
       sha256 = "1z8dfbwblrbmb8sgb0k8h1q0dvfdz7gw57las8nwd5gj6ss1jyvx";
     };
+    postInstall = lib.optionalString pkgs.stdenv.isDarwin ''
+      sed -e 's:reattach-to-user-namespace:${reattach-to-user-namespace}/bin/reattach-to-user-namespace:g' -i $target/sensible.tmux
+    '';
   };
 
   sessionist = mkDerivation {
diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix
index 39b0246d0d38..bc4f0faefb40 100644
--- a/pkgs/misc/vim-plugins/overrides.nix
+++ b/pkgs/misc/vim-plugins/overrides.nix
@@ -12,7 +12,7 @@
 
 # vim-go denpencies
 , asmfmt, delve, errcheck, godef, golint
-, gomodifytags, gotags, gotools, motion
+, gomodifytags, gotags, gotools, go-motion
 , gnused, reftools, gogetdoc, gometalinter
 , impl, iferr, gocode, gocode-gomod, go-tools
 }:
@@ -265,6 +265,7 @@ with generated;
       asmfmt
       delve
       errcheck
+      go-motion
       go-tools
       gocode
       gocode-gomod
@@ -277,7 +278,6 @@ with generated;
       gotools
       iferr
       impl
-      motion
       reftools
     ];
     in {