Merge pull request #18396 from rycee/fix/udiskie

udiskie: 1.4.8 -> 1.5.1

pkgs/applications/misc/udiskie/default.nix

@@ -0,0 +1,43 @@
+{ stdenv, fetchFromGitHub, asciidoc-full, gettext
+, gobjectIntrospection, gtk3, hicolor_icon_theme, libnotify
+, pythonPackages, udisks2, wrapGAppsHook }:
+
+pythonPackages.buildPythonApplication rec {
+  name = "udiskie-${version}";
+  version = "1.5.1";
+
+  src = fetchFromGitHub {
+    owner = "coldfix";
+    repo = "udiskie";
+    rev = version;
+    sha256 = "01x5fvllb262x6r3547l23z7p6hr7ddz034bkhmj2cqmf83sxwxd";
+  };
+
+  buildInputs = [
+    asciidoc-full        # For building man page.
+    hicolor_icon_theme
+    wrapGAppsHook
+  ];
+
+  propagatedBuildInputs = [
+    gettext gobjectIntrospection gtk3 libnotify pythonPackages.docopt
+    pythonPackages.pygobject3 pythonPackages.pyyaml udisks2
+  ];
+
+  postBuild = "make -C doc";
+
+  postInstall = ''
+    mkdir -p $out/share/man/man8
+    cp -v doc/udiskie.8 $out/share/man/man8/
+  '';
+
+  # tests require dbusmock
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "Removable disk automounter for udisks";
+    license = licenses.mit;
+    homepage = https://github.com/coldfix/udiskie;
+    maintainers = with maintainers; [ AndersonTorres ];
+  };
+}

pkgs/top-level/all-packages.nix

@@ -14686,6 +14686,8 @@ in
 
   udevil = callPackage ../applications/misc/udevil {};
 
+  udiskie = callPackage ../applications/misc/udiskie { };
+
   sakura = callPackage ../applications/misc/sakura {
     vte = gnome3.vte;
   };

pkgs/top-level/python-packages.nix

@@ -27140,47 +27140,8 @@ in modules // {
     };
   };
 
-  udiskie = buildPythonPackage rec {
+  # For backwards compatibility. Please use nixpkgs.udiskie instead.
-    version = "1.4.8";
+  udiskie = pkgs.udiskie.override { pythonPackages = self; };
-    name = "udiskie-${version}";
-
-    src = pkgs.fetchurl {
-      url = "https://github.com/coldfix/udiskie/archive/${version}.tar.gz";
-      sha256 = "0fj1kh6pmwyyy54ybc5fa625lhrxzhzmfx1nwz2lym5cpm4b21fl";
-    };
-
-    preConfigure = ''
-      export XDG_RUNTIME_DIR=/tmp
-    '';
-
-    buildInputs = [
-      pkgs.asciidoc-full        # For building man page.
-    ];
-
-    propagatedBuildInputs = with self; [ pkgs.gobjectIntrospection pkgs.gtk3 pyyaml pygobject3 pkgs.libnotify pkgs.udisks2 pkgs.gettext self.docopt ];
-
-    postBuild = "make -C doc";
-
-    postInstall = ''
-      mkdir -p $out/share/man/man8
-      cp -v doc/udiskie.8 $out/share/man/man8/
-    '';
-
-    preFixup = ''
-        wrapProgram "$out/bin/"* \
-          --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH"
-    '';
-
-    # tests require dbusmock
-    doCheck = false;
-
-    meta = {
-      description = "Removable disk automounter for udisks";
-      license = licenses.mit;
-      homepage = https://github.com/coldfix/udiskie;
-      maintainers = with maintainers; [ AndersonTorres ];
-    };
-  };
 
   # Should be bumped along with EFL!
   pythonefl = buildPythonPackage rec {