MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-17 23:36:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #56783 from dotlambda/udiskie-fix

Browse source 
udiskie: fix build
This commit is contained in:
xeji 2019-03-04 12:14:14 +01:00 committed by GitHub
commit 981ce3418a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 29 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
pkgs/applications/misc/udiskie/default.nix
View file

@ -1,14 +1,11 @@
{ stdenv, fetchFromGitHub, asciidoc-full, gettext
, gobject-introspection, gtk3, hicolor-icon-theme, libappindicator-gtk3, libnotify, librsvg
, udisks2, wrapGAppsHook
, buildPythonApplication
, docopt
, pygobject3
, pyyaml
, python3Packages
}:
buildPythonApplication rec {
name = "udiskie-${version}";
python3Packages.buildPythonApplication rec {
pname = "udiskie";
version = "1.7.7";
src = fetchFromGitHub {
@ -18,16 +15,27 @@ buildPythonApplication rec {
sha256 = "1j17z26vy44il2s9zgchvhq280vq8ag64ddi35f35b444wz2azlb";
};
buildInputs = [
nativeBuildInputs = [
gettext
asciidoc-full # For building man page.
hicolor-icon-theme
gobject-introspection
wrapGAppsHook
librsvg # required for loading svg icons (udiskie uses svg icons)
];
propagatedBuildInputs = [
gettext gobject-introspection gtk3 libnotify docopt
pygobject3 pyyaml udisks2 libappindicator-gtk3
buildInputs = [
hicolor-icon-theme
librsvg # required for loading svg icons (udiskie uses svg icons)
gobject-introspection
libnotify
gtk3
udisks2
libappindicator-gtk3
];
propagatedBuildInputs = with python3Packages; [
docopt
pygobject3
pyyaml
];
postBuild = "make -C doc";
@ -37,8 +45,14 @@ buildPythonApplication rec {
cp -v doc/udiskie.8 $out/share/man/man8/
'';
# tests require dbusmock
doCheck = false;
checkInputs = with python3Packages; [
nose
keyutils
];
checkPhase = ''
nosetests
'';
meta = with stdenv.lib; {
description = "Removable disk automounter for udisks";

2
pkgs/top-level/all-packages.nix
View file

@ -19242,7 +19242,7 @@ in
udevil = callPackage ../applications/misc/udevil {};
udiskie = python3Packages.callPackage ../applications/misc/udiskie { };
udiskie = callPackage ../applications/misc/udiskie { };
sakura = callPackage ../applications/misc/sakura { };