From 11e3503f1039f6c28a03d512aaa68979af4a6bce Mon Sep 17 00:00:00 2001
From: Renzo Carbonara <gnuk0001@gmail.com>
Date: Fri, 16 Jan 2015 20:23:44 -0300
Subject: Improve packaging of xbrightness

---
 pkgs/tools/X11/xbrightness/builder.sh  | 16 ----------------
 pkgs/tools/X11/xbrightness/default.nix |  8 +++++++-
 2 files changed, 7 insertions(+), 17 deletions(-)
 delete mode 100644 pkgs/tools/X11/xbrightness/builder.sh

(limited to 'pkgs/tools/X11/xbrightness')

diff --git a/pkgs/tools/X11/xbrightness/builder.sh b/pkgs/tools/X11/xbrightness/builder.sh
deleted file mode 100644
index f40ea0029912..000000000000
--- a/pkgs/tools/X11/xbrightness/builder.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-source $stdenv/setup
-
-configurePhase() {
-    xmkmf
-}
-
-buildPhase() {
-    make $makeFlags
-}
-
-installPhase() {
-    make install BINDIR=$out/bin
-    make install.man MANPATH=$out/share/man
-}
-
-genericBuild
diff --git a/pkgs/tools/X11/xbrightness/default.nix b/pkgs/tools/X11/xbrightness/default.nix
index 9701a759656a..9b7094cb1c74 100644
--- a/pkgs/tools/X11/xbrightness/default.nix
+++ b/pkgs/tools/X11/xbrightness/default.nix
@@ -3,7 +3,6 @@
 stdenv.mkDerivation {
 
   name = "xbrightness-0.3-mika-akk";
-  builder = ./builder.sh;
   src = fetchurl {
     url = http://shallowsky.com/software/xbrightness/xbrightness-0.3-mika-akk.tar.gz;
     sha256 = "2564dbd393544657cdabe4cbf535d9cfb9abe8edddb1b8cdb1ed4d12f358626e";
@@ -19,6 +18,13 @@ stdenv.mkDerivation {
     xlibs.libXxf86vm
   ];
 
+  configurePhase = "xmkmf";
+
+  installPhase = ''
+    make install BINDIR=$out/bin
+    make install.man MANPATH=$out/share/man
+  '';
+
   meta = {
     description = "X11 brigthness and gamma software control";
     homepage = http://shallowsky.com/software;
-- 
cgit 1.4.1