Merge pull request #5967 from k0ral/rmlint

rmlint: 1.0.8 -> 2.0.0
This commit is contained in:
Domen Kožar 2015-01-29 10:48:54 +01:00
commit 857f32dfe7
3 changed files with 45 additions and 14 deletions

View file

@ -1,24 +1,31 @@
{ fetchurl, stdenv }:
{ stdenv, fetchurl
, gettext, glib, json_glib, libelf, pkgconfig, scons, sphinx, utillinux }:
with stdenv.lib;
stdenv.mkDerivation rec {
name = "rmlint-1.0.8";
name = "rmlint-${version}";
version = "2.0.0";
src = fetchurl {
url = "https://github.com/downloads/sahib/rmlint/rmlint_1.0.8.tar.gz";
sha256 = "bea39a5872b39d3596e756f242967bc5bde6febeb996fdcd63fbcf5bfdc75f01";
url = "https://github.com/sahib/rmlint/archive/v${version}.tar.gz";
sha256 = "14jiswagipsmzxclcskn672ws4126p65l6hlzkkvanyv8gmpv90f";
};
preConfigure = ''
substituteInPlace Makefile.in \
--replace "/usr/" "/"
'';
patches = [ ./fix-scons.patch ];
makeFlags="DESTDIR=$(out)";
configurePhase = "scons config";
buildInputs = [ gettext glib json_glib libelf pkgconfig scons sphinx utillinux ];
buildPhase = "scons";
installPhase = "scons --prefix=$out install";
meta = {
description = "A tool to remove duplicates and other lint";
homepage = "https://github.com/sahib/rmlint";
platforms = stdenv.lib.platforms.linux;
license = stdenv.lib.licenses.gpl3;
description = "Extremely fast tool to remove duplicates and other lint from your filesystem.";
homepage = http://rmlint.readthedocs.org;
platforms = platforms.linux;
license = licenses.gpl3;
maintainers = [ maintainers.koral ];
};
}

View file

@ -0,0 +1,22 @@
diff --git b/SConstruct a/SConstruct
old mode 100644
new mode 100755
index a7fca2e..561007e
--- b/SConstruct
+++ a/SConstruct
@@ -404,11 +404,10 @@ options = dict(
SHLINKCOMSTR=link_shared_library_message,
LINKCOMSTR=link_program_message,
PREFIX=GetOption('prefix'),
- ENV={
- 'PATH': os.environ['PATH'],
- 'TERM': os.environ['TERM'],
- 'HOME': os.environ['HOME']
- }
+ ENV = dict([ (key, os.environ[key])
+ for key in os.environ
+ if key in ['PATH', 'TERM', 'HOME', 'PKG_CONFIG_PATH']
+ ])
)
if ARGUMENTS.get('VERBOSE') == "1":

View file

@ -2383,7 +2383,9 @@ let
rkflashtool = callPackage ../tools/misc/rkflashtool { };
rmlint = callPackage ../tools/misc/rmlint {};
rmlint = callPackage ../tools/misc/rmlint {
inherit (pythonPackages) sphinx;
};
rng_tools = callPackage ../tools/security/rng-tools { };