guake: 0.8.3 → 3.1.0

pkgs/applications/misc/guake/default.nix

@@ -1,76 +1,46 @@
-/* Beware!
+{ stdenv, fetchFromGitHub, fetchpatch, python3, gettext, gobjectIntrospection, wrapGAppsHook, glibcLocales
-After starting Guake it will give the error message "Guake can not init! Gconf Error. Have you installed guake.schemas properly?",
+, gtk3, keybinder3, libnotify, libutempter, vte }:
-which will have to be resolved manually, because I have not found a way to automate this, without being impure.
-
-If you have Guake installed, you can use `nix-build -A gnome3.guake` to get the path to the build directory in the nix store,
-which then can be used in the following command to install the schemas file of Guake:
-gconftool-2 --install-schema-file /path/returned/by/nix-build/share/gconf/schemas/guake.schemas
-
-It can be removed again by the following command:
-gconftool-2 --recursive-unset /apps/guake
-*/
-{ stdenv, fetchurl, lib
-, pkgconfig, libtool, intltool, makeWrapper
-, dbus, gtk2, gconf, python2Packages, libutempter, vte, keybinder, gnome2, gnome3 }:
-
-with lib;
 
 let
-  inherit (python2Packages) python;
+  version = "3.1.0";
-  inputs = [ dbus gtk2 gconf python libutempter vte keybinder gnome3.gnome-common ];
+in python3.pkgs.buildPythonApplication rec {
-  pyPath = makeSearchPathOutput "lib" python.sitePackages (attrVals [ "dbus-python" "notify" "pyGtkGlade" "pyxdg" ] python2Packages ++ [ gnome2.gnome_python ]);
- in stdenv.mkDerivation rec {
   name = "guake-${version}";
-  version = "0.8.3";
+  format = "other";
 
-  src = fetchurl {
+  src = fetchFromGitHub {
-    url = "https://github.com/Guake/guake/archive/${version}.tar.gz";
+    owner = "Guake";
-    sha256 = "1lbmdz3i9a97840h8239s360hd37nmhy3hs6kancxbzl1512ak1y";
+    repo = "guake";
+    rev = version;
+    sha256 = "0wyis7vxfhwrpq5r72c58k7hqzbk0f5ilm1zffcmbryvy11abgmx";
   };
 
-  nativeBuildInputs = [ pkgconfig libtool intltool makeWrapper ];
+  patches = [
-
+    # https://github.com/Guake/guake/issues/1264
-  buildInputs = inputs ++ (with python2Packages; [ pyGtkGlade pyxdg ]);
+    (fetchpatch {
-
+      url = https://github.com/Guake/guake/commit/f289aa381bc5fffe83b1ba385c606a2e5cdc94a8.patch;
-  propagatedUserEnvPkgs = [ gconf.out ];
+      sha256 = "038niw44q14fs34nha1lz9vmxhf0l766ni8nsdxpid4crra2wjd3";
-
+    })
-  patchPhase = ''
-    patchShebangs .
-  '';
-
-  configureScript = "./autogen.sh";
-
-  configureFlags = [
-    "--sysconfdir=/etc"
-    "--localstatedir=/var"
-    "--disable-schemas-install"
   ];
 
-  installFlags = [
+  nativeBuildInputs = [ gettext gobjectIntrospection wrapGAppsHook python3.pkgs.pip glibcLocales ];
-    # Configuring the installation to not install gconf schemas is not always supported,
+
-    # therefore gconftool-2 has this variable, which will make gconftool-2 not update any of the databases.
+  buildInputs = [ gtk3 keybinder3 libnotify python3 vte ];
-    "GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1"
+
-    "sysconfdir=\${out}/etc"
+  propagatedBuildInputs = with python3.pkgs; [ dbus-python pbr pycairo pygobject3 ];
-    "localstatedir=\${TMPDIR}"
+
+  LC_ALL = "en_US.UTF-8"; # fixes weird encoding error, see https://github.com/NixOS/nixpkgs/pull/38642#issuecomment-379727699
+
+  PBR_VERSION = version; # pbr needs either .git directory, sdist, or env var
+
+  makeFlags = [
+    "prefix=$(out)"
   ];
 
-  postInstall = ''
+  preFixup = ''
-    mkdir -p $out/share/gconf/schemas
+    gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ libutempter ]}")
-    cp data/guake.schemas $out/share/gconf/schemas
   '';
 
-  postFixup = ''
+  meta = with stdenv.lib; {
-    for bin in $out/bin/{guake,guake-prefs}; do
-      substituteInPlace $bin \
-        --replace '/usr/bin/env python2' ${python.interpreter}
-      wrapProgram $bin \
-        --prefix XDG_DATA_DIRS : "$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \
-        --prefix LD_LIBRARY_PATH : ${makeLibraryPath inputs} \
-        --prefix PYTHONPATH : "$out/${python.sitePackages}:${pyPath}:$PYTHONPATH"
-    done
-  '';
-
-  meta = {
     description = "Drop-down terminal for GNOME";
     homepage = http://guake-project.org;
     license = licenses.gpl2;

pkgs/top-level/all-packages.nix

@@ -16050,8 +16050,7 @@ with pkgs;
   };
 
   guake = callPackage ../applications/misc/guake {
-    gconf = gnome2.GConf;
+    inherit (gnome3) vte;
-    vte = gnome2.vte.override { pythonSupport = true; };
   };
 
   guitone = callPackage ../applications/version-management/guitone {