From 438f35dac0e4c1e9192076267874568b5db95560 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Sun, 23 Mar 2008 16:52:27 +0000
Subject: [PATCH] removed wmii includeUnpack hack having been used to support
 old and new setup script

svn path=/nixpkgs/trunk/; revision=11270
---
 pkgs/applications/window-managers/wmii/default.nix     | 2 +-
 pkgs/applications/window-managers/wmii31/default.nix   | 2 +-
 pkgs/development/libraries/libixp_for_wmii/default.nix | 2 +-
 pkgs/top-level/all-packages.nix                        | 3 ---
 4 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/window-managers/wmii/default.nix b/pkgs/applications/window-managers/wmii/default.nix
index a7a4d2973c0b..a6148e3a4da0 100644
--- a/pkgs/applications/window-managers/wmii/default.nix
+++ b/pkgs/applications/window-managers/wmii/default.nix
@@ -9,7 +9,7 @@ args: with args; stdenv.mkDerivation {
   buildInputs = [ libX11 libixp ];
   inherit libixp;
 
-  phases = (if args.includeUnpack then "unpackPhase " else "")+"installPhase";
+  phases = "unpackPhase installPhase";
 
   installPhase = "
      export CFLAGS=\$NIX_CFLAGS_COMPILE
diff --git a/pkgs/applications/window-managers/wmii31/default.nix b/pkgs/applications/window-managers/wmii31/default.nix
index ff83b78c37b2..1602f1ece399 100644
--- a/pkgs/applications/window-managers/wmii31/default.nix
+++ b/pkgs/applications/window-managers/wmii31/default.nix
@@ -9,7 +9,7 @@ args: with args; stdenv.mkDerivation {
   buildInputs = [ libX11 libixp ];
   inherit libixp;
  
-  phases = (if args.includeUnpack then "unpackPhase " else "")+"installPhase";
+  phases = "unpackPhase installPhase";
 
   installPhase = "
      export CFLAGS=\$NIX_CFLAGS_COMPILE
diff --git a/pkgs/development/libraries/libixp_for_wmii/default.nix b/pkgs/development/libraries/libixp_for_wmii/default.nix
index c26bf7dfc6c0..6ee94a52dd20 100644
--- a/pkgs/development/libraries/libixp_for_wmii/default.nix
+++ b/pkgs/development/libraries/libixp_for_wmii/default.nix
@@ -1,7 +1,7 @@
 args: with args;
 stdenv.mkDerivation {
   name = "libixp_for_wmii";
-  phases = (if args.includeUnpack then "unpackPhase " else "")+"installPhase";
+  phases = "unpackPhase installPhase";
   installPhase = "
 
      export LDFLAGS\=$(echo \$NIX_LDFLAGS | sed -e 's/-rpath/-L/g')
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 60cdd5e8064c..dab7bd226ab3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2823,7 +2823,6 @@ let pkgs = rec {
 
   libixp_for_wmii = lowPrio (import ../development/libraries/libixp_for_wmii {
     inherit fetchurl stdenv;
-    includeUnpack = getConfig ["stdenv" "includeUnpack"] false;
   });
 
   libzip = import ../development/libraries/libzip {
@@ -5615,14 +5614,12 @@ let pkgs = rec {
     libixp = libixp03;
     inherit fetchurl /* fetchhg */ stdenv gawk;
     inherit (xlibs) libX11;
-    includeUnpack = getConfig ["stdenv" "includeUnpack"] false;
   };
 
   wmiiSnap = import ../applications/window-managers/wmii {
     libixp = libixp_for_wmii;
     inherit fetchurl /* fetchhg */ stdenv gawk;
     inherit (xlibs) libX11;
-    includeUnpack = getConfig ["stdenv" "includeUnpack"] false;
   };
 
   wordnet = import ../applications/misc/wordnet {