Updating powertop.

svn path=/nixpkgs/trunk/; revision=26426
This commit is contained in:
Lluís Batlle i Rossell 2011-03-18 20:44:35 +00:00
parent 83f99d0c38
commit af3e5b5050
3 changed files with 19 additions and 17 deletions

View File

@ -1,11 +1,11 @@
{stdenv, fetchurl, ncurses, gettext}: {stdenv, fetchurl, ncurses, gettext}:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "powertop-1.11"; name = "powertop-1.13";
src = fetchurl { src = fetchurl {
url = http://www.lesswatts.org/projects/powertop/download/powertop-1.11.tar.gz; url = http://www.lesswatts.org/projects/powertop/download/powertop-1.13.tar.gz;
sha256 = "1wl0c7sav5rf7andnx704vs3n5gj2b5g1adx8zjfbbgvwm9wrrvh"; sha256 = "164dqp6msdaxpi2bmvwawasyrf1sfvanlc9ddp97v1wnjh46dj1b";
}; };
patches = [./powertop-1.8.patch]; patches = [./powertop-1.13.patch];
buildInputs = [ncurses gettext]; buildInputs = [ncurses gettext];
} }

View File

@ -0,0 +1,15 @@
diff -ru powertop-1.13/Makefile powertop-1.13.new/Makefile
--- powertop-1.13/Makefile
+++ powertop-1.13.new/Makefile
@@ -1,6 +1,6 @@
VERSION = 1.13
-BINDIR=/usr/bin
-LOCALESDIR=/usr/share/locale
-MANDIR=/usr/share/man/man8
+BINDIR=${out}/bin
+LOCALESDIR=${out}/share/locale
+MANDIR=${out}/share/man/man8
WARNFLAGS=-Wall -W -Wshadow -W -Wformat -Wimplicit-function-declaration -Wimplicit-int
CFLAGS?=-Os -g ${WARNFLAGS}
CC?=gcc

View File

@ -1,13 +0,0 @@
diff -ru powertop-1.8/Makefile powertop-1.8.new/Makefile
--- powertop-1.8/Makefile 2007-08-19 19:43:08.000000000 +0200
+++ powertop-1.8.new/Makefile 2007-09-23 12:54:59.000000000 +0200
@@ -1,6 +1,6 @@
-BINDIR=/usr/bin
-LOCALESDIR=/usr/share/locale
-MANDIR=/usr/share/man/man1
+BINDIR=${out}/bin
+LOCALESDIR=${out}/share/locale
+MANDIR=${out}/share/man/man1
WARNFLAGS=-Wall -W -Wshadow
CFLAGS?=-Os -g ${WARNFLAGS}
CC?=gcc