diff options
| author | Marc Weber <marco-oweber@gmx.de> | 2010-05-17 13:35:38 +0000 |
|---|---|---|
| committer | Marc Weber <marco-oweber@gmx.de> | 2010-05-17 13:35:38 +0000 |
| commit | aebfa8548fcf7c132abdfc58e2efbef247c04b0f (patch) | |
| tree | 34108e15180ffe8580d6ba3c5ed8ce9799dd7968 | |
| parent | 38c35ba49bcc9d0fc8df7190a0feb6a10459cdeb (diff) | |
| download | nixlib-aebfa8548fcf7c132abdfc58e2efbef247c04b0f.tar nixlib-aebfa8548fcf7c132abdfc58e2efbef247c04b0f.tar.gz nixlib-aebfa8548fcf7c132abdfc58e2efbef247c04b0f.tar.bz2 nixlib-aebfa8548fcf7c132abdfc58e2efbef247c04b0f.tar.lz nixlib-aebfa8548fcf7c132abdfc58e2efbef247c04b0f.tar.xz nixlib-aebfa8548fcf7c132abdfc58e2efbef247c04b0f.tar.zst nixlib-aebfa8548fcf7c132abdfc58e2efbef247c04b0f.zip | |
Revert "update wmii. libixp vanished"
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
| -rw-r--r-- | pkgs/applications/window-managers/wmii/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/development/libraries/libixp_for_wmii/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 5 |
3 files changed, 9 insertions, 12 deletions
diff --git a/pkgs/applications/window-managers/wmii/default.nix b/pkgs/applications/window-managers/wmii/default.nix index b417639db9d7..3df24cf33603 100644 --- a/pkgs/applications/window-managers/wmii/default.nix +++ b/pkgs/applications/window-managers/wmii/default.nix @@ -1,14 +1,12 @@ args: with args; stdenv.mkDerivation { - name = "wmii-3.9b1"; + name = "wmii-20071116"; src = fetchurl { - url = http://dl.suckless.org/wmii/wmii+ixp-3.9b1.tbz; - name = "wmii+ixp-3.9b1.tar.bz2"; # srcUnpack does not know about tbz - sha256 = "0i04mf5cl4m6mn5kcy913mmrnd2ir0ardmskswchnr6fxpbcyvml"; + url = http://dl.suckless.org/wmii/wmii-3.6.tar.gz; + sha256 = "46f39b788c5ef4695040b36cc7d9c539db0306bafc4d8cefdc5980ed4331b216"; }; - buildInputs = [ libX11 libixp xextproto libXt libXext libXft - freetype libXrandr libXinerama pkgconfig]; + buildInputs = [ libX11 libixp xextproto libXt libXext ]; inherit libixp; phases = "unpackPhase installPhase"; diff --git a/pkgs/development/libraries/libixp_for_wmii/default.nix b/pkgs/development/libraries/libixp_for_wmii/default.nix index fe953e263e3d..a322c087d890 100644 --- a/pkgs/development/libraries/libixp_for_wmii/default.nix +++ b/pkgs/development/libraries/libixp_for_wmii/default.nix @@ -7,15 +7,15 @@ stdenv.mkDerivation { sed -i -e \"s%^PREFIX.*%PREFIX=\$out%\" \\ -e \"s%^\\(INCLUDE.*\\)%\\1 \$NIX_CFLAGS_COMPILE%\" \\ -e \"s%^\\(LIBS.*\\)%\\1 \$LDFLAGS%\" \\ - config.mk + config.mk make mkdir -p \$out/include cp -r include/*.h \$out/include cp -r lib \$out "; src = fetchurl { - url = http://dl.suckless.org/libs/libixp-0.5.tar.gz; - sha256 = "0jqyw8xzih7x7apdp2s9w8agjry890kf55zj2habsg78cyxz1x35"; + url = http://dl.suckless.org/libs/libixp-0.4.tar.gz; + sha256 = "0b44p9wvmzxpyf2xd86rxyr49bmfh9cd5hj3d234gkvynvgph60p"; }; meta = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index abd3a9071185..7f0e394de6d6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8660,9 +8660,8 @@ let wmiiSnap = import ../applications/window-managers/wmii { libixp = libixp_for_wmii; - inherit fetchurl /* fetchhg */ stdenv gawk - freetype pkgconfig; - inherit (xlibs) libX11 xextproto libXt libXext libXft libXrandr libXinerama; + inherit fetchurl /* fetchhg */ stdenv gawk; + inherit (xlibs) libX11 xextproto libXt libXext; includeUnpack = getConfig ["stdenv" "includeUnpack"] false; }; |