diff options
| author | koral <koral@mailoo.org> | 2015-05-09 10:45:14 +0000 |
|---|---|---|
| committer | koral <koral@mailoo.org> | 2015-05-09 10:45:14 +0000 |
| commit | e047ac86d62aa6dd5e8f29919e95076772b9d0ed (patch) | |
| tree | df06a2f65e4421af65110eeb2d6543f8426fbc02 /pkgs/tools/misc/rmlint | |
| parent | e50afd12b7647921a18336add9fd81e8798b3d6d (diff) | |
rmlint: 2.0.0 -> 2.1.0
Diffstat (limited to 'pkgs/tools/misc/rmlint')
| -rw-r--r-- | pkgs/tools/misc/rmlint/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/tools/misc/rmlint/fix-scons.patch | 22 |
2 files changed, 2 insertions, 26 deletions
diff --git a/pkgs/tools/misc/rmlint/default.nix b/pkgs/tools/misc/rmlint/default.nix index aed93775ce98a..9e61a5c195e4a 100644 --- a/pkgs/tools/misc/rmlint/default.nix +++ b/pkgs/tools/misc/rmlint/default.nix @@ -4,15 +4,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "rmlint-${version}"; - version = "2.0.0"; + version = "2.1.0"; src = fetchurl { url = "https://github.com/sahib/rmlint/archive/v${version}.tar.gz"; - sha256 = "14jiswagipsmzxclcskn672ws4126p65l6hlzkkvanyv8gmpv90f"; + sha256 = "17hqkx1ji6rbvliji18my16b23ig9d6v4azgypwl0fam2ar4rm4g"; }; - patches = [ ./fix-scons.patch ]; - configurePhase = "scons config"; buildInputs = [ gettext glib json_glib libelf pkgconfig scons sphinx utillinux ]; diff --git a/pkgs/tools/misc/rmlint/fix-scons.patch b/pkgs/tools/misc/rmlint/fix-scons.patch deleted file mode 100644 index 4d7d832f13d7f..0000000000000 --- a/pkgs/tools/misc/rmlint/fix-scons.patch +++ /dev/null @@ -1,22 +0,0 @@ -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": |