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

3 files changed, 63 insertions, 59 deletions

diff --git a/pkgs/applications/graphics/gimp/2.8.nix b/pkgs/applications/graphics/gimp/2.8.nix
index 27d7376fe526..bc101e241145 100644
--- a/pkgs/applications/graphics/gimp/2.8.nix
+++ b/pkgs/applications/graphics/gimp/2.8.nix
@@ -28,7 +28,12 @@ stdenv.mkDerivation rec {
 
   pythonPath = [ pygtk ];
 
-  postInstall = ''wrapPythonPrograms'';
+  postFixup = ''
+    wrapPythonProgramsIn $out/lib/gimp/2.0/plug-ins/
+    wrapProgram $out/bin/gimp \
+      --prefix PYTHONPATH : "$PYTHONPATH" \
+      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE"
+  '';
 
   passthru = { inherit gtk; }; # probably its a good idea to use the same gtk in plugins ?
 
diff --git a/pkgs/applications/misc/keepassx/2.0-http.nix b/pkgs/applications/misc/keepassx/2.0-http.nix
new file mode 100644
index 000000000000..b3a84d36b1ec
--- /dev/null
+++ b/pkgs/applications/misc/keepassx/2.0-http.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchFromGitHub, cmake, libgcrypt, qt5, zlib, libmicrohttpd, libXtst }:
+
+stdenv.mkDerivation rec {
+  name = "keepassx2-http-unstable-${version}";
+  version = "2016-05-27";
+
+  src = fetchFromGitHub {
+    owner = "droidmonkey";
+    repo = "keepassx_http";
+    rev = "bb2e1ee8da3a3245c3ca58978a979dd6b5c2472a";
+    sha256 = "1rlbjs0i1kbrkksliisnykhki8f15g09xm3fwqlgcfc2czwbv5sv";
+  };
+
+  buildInputs = [ cmake libgcrypt zlib qt5.full libXtst libmicrohttpd ];
+
+  meta = {
+    description = "Fork of the keepassX password-manager with additional http-interface to allow browser-integration an use with plugins such as PasslFox (https://github.com/pfn/passifox). See also keepassX2.";
+    homepage = http://www.keepassx.org/;
+    license = stdenv.lib.licenses.gpl2;
+    maintainers = with stdenv.lib.maintainers; [ s1lvester ];
+    platforms = with stdenv.lib.platforms; linux;
+  };
+}
diff --git a/pkgs/applications/networking/instant-messengers/oneteam/default.nix b/pkgs/applications/networking/instant-messengers/oneteam/default.nix
index bec367818e2f..00650bb685de 100644
--- a/pkgs/applications/networking/instant-messengers/oneteam/default.nix
+++ b/pkgs/applications/networking/instant-messengers/oneteam/default.nix
@@ -1,88 +1,64 @@
-x@{builderDefsPackage
-  , fetchgit, perl, xulrunner, cmake, perlPackages, zip, unzip, pkgconfig
-  , libpulseaudio, glib, gtk, pixman, nspr, nss, libXScrnSaver, scrnsaverproto
-  , ...}:
-builderDefsPackage
-(a :  
-let 
-  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 
-    ["fetchgit" "perlPackages"];
+{ stdenv, fetchFromGitHub
+, perl, xulrunner, cmake, perlPackages, zip, unzip, pkgconfig
+, libpulseaudio, glib, gtk, pixman, nspr, nss, libXScrnSaver
+, scrnsaverproto
+}:
 
-  buildInputs = map (n: builtins.getAttr n x)
-    (builtins.attrNames (builtins.removeAttrs x helperArgNames)) ++ [
-      a.perlPackages.SubName a.gtk a.glib
-    ];
-  sourceInfo = rec {
-    baseName="oneteam";
-    version="git-head";
-    name="${baseName}-${version}";
-    url="git://git.process-one.net/oneteam/oneteam.git";
-    rev="066cd861ea4436bbe363f032c58a746a1cac7498";
-    hash="972310d6ef20db7dc749d7d935aa50889afe2004db2a07409830e09ef639f30a";
-    method="fetchgit";
-  };
-in
-rec {
-  srcDrv = a.fetchgit {
-    url = sourceInfo.url;
-    sha256 = sourceInfo.hash;
-    rev = sourceInfo.rev;
-  };
+stdenv.mkDerivation rec {
+  name = "oneteam-unstable-2013-02-21";
 
-  src=srcDrv + "/";
+  src = fetchFromGitHub {
+    repo = "oneteam";
+    owner = "processone";
+    rev = "c51bc545c3a32db4ea8b96e43b84fcfc6b8d3d2a";
+    sha256 = "19104fwdaf0nnsr5w755fg8wwww5sh96wmn939gxa5ah155nf2w3";
+  };
 
-  inherit (sourceInfo) name version;
-  inherit buildInputs;
+  nativeBuildInputs = [ pkgconfig cmake zip unzip ];
 
-  /* doConfigure should be removed if not needed */
-  phaseNames = ["goComponents" "setVars" "fixComponents" "doCmake" 
-    "doMakeInstall" "goBack" "buildApp" "doDeploy"];
+  buildInputs =
+    [ perl xulrunner libpulseaudio glib gtk pixman nspr
+      nss libXScrnSaver scrnsaverproto
+    ] ++ [ perlPackages.SubName gtk glib ];
 
-  fixComponents = a.fullDepEntry ''
+  postPatch = ''
     sed -e '1i#include <netinet/in.h>' -i src/rtp/otRTPDecoder.cpp src/rtp/otRTPEncoder.cpp
-  '' ["minInit" "doUnpack"];
-
-  setVars=a.noDepEntry ''
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${nspr.dev}/include/nspr"
   '';
 
-  cmakeBuildDir="cmake-build";
-  cmakeFlags=["-D XPCOM_GECKO_SDK=${xulrunner}/lib/xulrunner-devel-${xulrunner.version}"];
-
-  goComponents=a.fullDepEntry "cd src/components" ["doUnpack"];
-  goBack=a.noDepEntry "cd ../../..";
+  cmakeBuildDir = "cmake-build";
+  cmakeFlags = ["-D XPCOM_GECKO_SDK=${xulrunner}/lib/xulrunner-devel-${xulrunner.version}"];
 
-  buildApp=a.fullDepEntry ''
+  buildPhase = ''
+    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${nspr.dev}/include/nspr"
+    cd src/components
     perl build.pl XULAPP 1
-  '' ["addInputs"];
+    cd ../../
+  '';
 
-  doDeploy = a.fullDepEntry ''
+  installPhase = ''
     TARGET_DIR="$out/share/oneteam/app"
     BUILD_DIR="$PWD"
     mkdir -p "$TARGET_DIR"
     cd "$TARGET_DIR"
     unzip "$BUILD_DIR/oneteam.xulapp"
     mkdir -p "$out/bin"
-    echo "#! ${a.stdenv.shell}" > "$out/bin/oneteam"
+    echo "#! ${stdenv.shell}" > "$out/bin/oneteam"
     echo "\"${xulrunner}/bin/xulrunner\" \"$TARGET_DIR/application.ini\"" > "$out/bin/oneteam"
     chmod a+x "$out/bin/oneteam"
     mkdir -p "$out/share/doc"
     cp -r "$BUILD_DIR/docs" "$out/share/doc/oneteam"
-  '' ["defEnsureDir"];
+  '';
 
   meta = {
     description = "An XMPP client";
-    maintainers = with a.lib.maintainers;
-    [
-      raskin
-    ];
-    license = a.lib.licenses.gpl2;
+    maintainers = with stdenv.lib.maintainers; [ raskin ];
+    license = stdenv.lib.licenses.gpl2;
     homepage="http://oneteam.im";
   };
+
   passthru = {
     updateInfo = {
-      downloadPage = "git://git.process-one.net/oneteam/oneteam.git";
+      downloadPage = "git://github.com/processone/oneteam";
     };
   };
-}) x
-
+}