public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "update wmii. libixp vanished"

Browse Source 
The new wmii has some wired behaviour:
- When you move windows the curser location changes.
  Until the window manager has changed that location movement of mouse is
  ignored.
- window do not always popup in the col which was focused.
- wmiimenu broke

old wmii does not build with newer libixp

Until I know how to fix those issues I'll revert my update

This reverts -r 21683

svn path=/nixpkgs/trunk/; revision=21816
This commit is contained in:
Marc Weber 2010-05-17 13:35:38 +00:00
parent 38c35ba49b
commit aebfa8548f
3 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/applications/window-managers/wmii/default.nix
View File

@ -1,14 +1,12 @@
args: with args; stdenv.mkDerivation { args: with args; stdenv.mkDerivation {
name = "wmii-3.9b1"; name = "wmii-20071116";
src = fetchurl { src = fetchurl {
url = http://dl.suckless.org/wmii/wmii+ixp-3.9b1.tbz; url = http://dl.suckless.org/wmii/wmii-3.6.tar.gz;
name = "wmii+ixp-3.9b1.tar.bz2"; # srcUnpack does not know about tbz sha256 = "46f39b788c5ef4695040b36cc7d9c539db0306bafc4d8cefdc5980ed4331b216";
sha256 = "0i04mf5cl4m6mn5kcy913mmrnd2ir0ardmskswchnr6fxpbcyvml";
}; };
buildInputs = [ libX11 libixp xextproto libXt libXext libXft buildInputs = [ libX11 libixp xextproto libXt libXext ];
freetype libXrandr libXinerama pkgconfig];
inherit libixp; inherit libixp;
phases = "unpackPhase installPhase"; phases = "unpackPhase installPhase";

6
pkgs/development/libraries/libixp_for_wmii/default.nix
View File

@ -7,15 +7,15 @@ stdenv.mkDerivation {
sed -i -e \"s%^PREFIX.*%PREFIX=\$out%\" \\ sed -i -e \"s%^PREFIX.*%PREFIX=\$out%\" \\
-e \"s%^\\(INCLUDE.*\\)%\\1 \$NIX_CFLAGS_COMPILE%\" \\ -e \"s%^\\(INCLUDE.*\\)%\\1 \$NIX_CFLAGS_COMPILE%\" \\
-e \"s%^\\(LIBS.*\\)%\\1 \$LDFLAGS%\" \\ -e \"s%^\\(LIBS.*\\)%\\1 \$LDFLAGS%\" \\
config.mk config.mk
make make
mkdir -p \$out/include mkdir -p \$out/include
cp -r include/*.h \$out/include cp -r include/*.h \$out/include
cp -r lib \$out cp -r lib \$out
"; ";
src = fetchurl { src = fetchurl {
url = http://dl.suckless.org/libs/libixp-0.5.tar.gz; url = http://dl.suckless.org/libs/libixp-0.4.tar.gz;
sha256 = "0jqyw8xzih7x7apdp2s9w8agjry890kf55zj2habsg78cyxz1x35"; sha256 = "0b44p9wvmzxpyf2xd86rxyr49bmfh9cd5hj3d234gkvynvgph60p";
}; };
meta = { meta = {

5
pkgs/top-level/all-packages.nix
View File

@ -8660,9 +8660,8 @@ let
wmiiSnap = import ../applications/window-managers/wmii { wmiiSnap = import ../applications/window-managers/wmii {
libixp = libixp_for_wmii; libixp = libixp_for_wmii;
inherit fetchurl /* fetchhg */ stdenv gawk inherit fetchurl /* fetchhg */ stdenv gawk;
freetype pkgconfig; inherit (xlibs) libX11 xextproto libXt libXext;
inherit (xlibs) libX11 xextproto libXt libXext libXft libXrandr libXinerama;
includeUnpack = getConfig ["stdenv" "includeUnpack"] false; includeUnpack = getConfig ["stdenv" "includeUnpack"] false;
}; };