about summary refs log tree commit diff
path: root/pkgs/top-level
diff options
context:
space:
mode:
authorMarc Weber <marco-oweber@gmx.de>2008-06-08 21:41:07 +0000
committerMarc Weber <marco-oweber@gmx.de>2008-06-08 21:41:07 +0000
commit620138ad0cfddab82c7e7a42f0e30eedbd24fff7 (patch)
treed82ec398b311dfdb72f49a805030ccbc731fc00a /pkgs/top-level
parent2430f8e5620a6cd48b60e1b55ec54c54518c2dcf (diff)
downloadnixlib-620138ad0cfddab82c7e7a42f0e30eedbd24fff7.tar
nixlib-620138ad0cfddab82c7e7a42f0e30eedbd24fff7.tar.gz
nixlib-620138ad0cfddab82c7e7a42f0e30eedbd24fff7.tar.bz2
nixlib-620138ad0cfddab82c7e7a42f0e30eedbd24fff7.tar.lz
nixlib-620138ad0cfddab82c7e7a42f0e30eedbd24fff7.tar.xz
nixlib-620138ad0cfddab82c7e7a42f0e30eedbd24fff7.tar.zst
nixlib-620138ad0cfddab82c7e7a42f0e30eedbd24fff7.zip
removed libixp-0.3 (wmiimenu does also build with 0.4)
wmii updated

svn path=/nixpkgs/trunk/; revision=12011
Diffstat (limited to 'pkgs/top-level')
-rw-r--r--pkgs/top-level/all-packages.nix9
1 files changed, 3 insertions, 6 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cffe12b5e173..1e1c78e866ab 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3051,10 +3051,6 @@ let pkgs = rec {
     inherit fetchurl stdenv libxml2;
   };
 
-  libixp03 = import ../development/libraries/libixp/libixp-0.3.nix {
-    inherit fetchurl stdenv;
-  };
-
   libixp_for_wmii = lowPrio (import ../development/libraries/libixp_for_wmii {
     inherit fetchurl stdenv;
   });
@@ -6480,7 +6476,7 @@ let pkgs = rec {
 
   # I'm keen on wmiimenu only  >wmii-3.5 no longer has it... 
   wmiimenu = import ../applications/window-managers/wmii31 {
-    libixp = libixp03;
+    libixp = libixp_for_wmii;
     inherit fetchurl /* fetchhg */ stdenv gawk;
     inherit (xlibs) libX11;
   };
@@ -6488,7 +6484,8 @@ let pkgs = rec {
   wmiiSnap = import ../applications/window-managers/wmii {
     libixp = libixp_for_wmii;
     inherit fetchurl /* fetchhg */ stdenv gawk;
-    inherit (xlibs) libX11;
+    inherit (xlibs) libX11 xextproto libXt libXext;
+    includeUnpack = getConfig ["stdenv" "includeUnpack"] false;
   };
 
   wordnet = import ../applications/misc/wordnet {