summary refs log tree commit diff
path: root/pkgs/misc/cups
diff options
context:
space:
mode:
authorRobin Gloster <mail@glob.in>2016-05-04 10:08:35 +0000
committerRobin Gloster <mail@glob.in>2016-05-04 10:11:04 +0000
commit9820cb1bf24254199db05856bbb4919378ac75cb (patch)
tree6c6bfeb09e5799573e7546419e3496a6fcf0863a /pkgs/misc/cups
parentaadaa913792b0fdeb68b02425e4f03d2f8286a1f (diff)
downloadnixlib-9820cb1bf24254199db05856bbb4919378ac75cb.tar
nixlib-9820cb1bf24254199db05856bbb4919378ac75cb.tar.gz
nixlib-9820cb1bf24254199db05856bbb4919378ac75cb.tar.bz2
nixlib-9820cb1bf24254199db05856bbb4919378ac75cb.tar.lz
nixlib-9820cb1bf24254199db05856bbb4919378ac75cb.tar.xz
nixlib-9820cb1bf24254199db05856bbb4919378ac75cb.tar.zst
nixlib-9820cb1bf24254199db05856bbb4919378ac75cb.zip
use dontBuild instead of hacks
changes:
 * buildPhase = "true"
 * buildPhase = ":"
Diffstat (limited to 'pkgs/misc/cups')
-rw-r--r--pkgs/misc/cups/drivers/brgenml1cupswrapper/default.nix9
-rw-r--r--pkgs/misc/cups/drivers/brgenml1lpr/default.nix8
2 files changed, 8 insertions, 9 deletions
diff --git a/pkgs/misc/cups/drivers/brgenml1cupswrapper/default.nix b/pkgs/misc/cups/drivers/brgenml1cupswrapper/default.nix
index 3623f78eb200..db60ece128f5 100644
--- a/pkgs/misc/cups/drivers/brgenml1cupswrapper/default.nix
+++ b/pkgs/misc/cups/drivers/brgenml1cupswrapper/default.nix
@@ -9,7 +9,7 @@
 
     Logging
     -------
-    
+
     `/tmp/br_cupswrapper_ml1.log` when `DEBUG > 0` in `brother_lpdwrapper_BrGenML1`.
     Note that when `DEBUG > 1` the wrapper stops performing its function. Better
     keep `DEBUG == 1` unless this is desirable.
@@ -29,7 +29,7 @@
         Fixed.
 
      3.  >  perl: warning: Falling back to the standard locale ("C").
-    
+
             are supported and installed on your system.
             LANG = "en_US.UTF-8"
             LC_ALL = (unset),
@@ -67,12 +67,11 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ makeWrapper ];
   buildInputs = [ cups perl coreutils gnused gnugrep brgenml1lpr ];
 
-  configurePhase = ":";
-  buildPhase = ":";
+  dontBuild = true;
 
   patchPhase = ''
     WRAPPER=opt/brother/Printers/BrGenML1/cupswrapper/brother_lpdwrapper_BrGenML1
-    PAPER_CFG=opt/brother/Printers/BrGenML1/cupswrapper/paperconfigml1  
+    PAPER_CFG=opt/brother/Printers/BrGenML1/cupswrapper/paperconfigml1
 
     substituteInPlace $WRAPPER \
       --replace "basedir =~" "basedir = \"${brgenml1lpr}/opt/brother/Printers/BrGenML1\"; #" \
diff --git a/pkgs/misc/cups/drivers/brgenml1lpr/default.nix b/pkgs/misc/cups/drivers/brgenml1lpr/default.nix
index 6dc2408ec88a..bd069b0d65a9 100644
--- a/pkgs/misc/cups/drivers/brgenml1lpr/default.nix
+++ b/pkgs/misc/cups/drivers/brgenml1lpr/default.nix
@@ -8,7 +8,7 @@
 
     Logging
     -------
-    
+
     `/tmp/br_lpdfilter_ml1.log` when `$ENV{LPD_DEBUG} > 0` in `filter_BrGenML1`
     which is activated automatically when `DEBUG > 0` in `brother_lpdwrapper_BrGenML1`
     from the cups wrapper.
@@ -17,7 +17,7 @@
     ------
 
      -  filter_BrGenML1 ln 196 `my $GHOST_SCRIPT=`which gs`;`
-      
+
         `GHOST_SCRIPT` is empty resulting in an empty `/tmp/br_lpdfilter_ml1_gsout.dat` file.
         See `/tmp/br_lpdfilter_ml1.log` for the executed command.
 
@@ -49,8 +49,8 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ makeWrapper ];
   buildInputs = [ cups perl glibc ghostscript which ];
-  
-  buildPhase = ":";
+
+  dontBuild = true;
 
   patchPhase = ''
     INFDIR=opt/brother/Printers/BrGenML1/inf