diff options
author | Marc Weber <marco-oweber@gmx.de> | 2008-06-08 21:41:07 +0000 |
---|---|---|
committer | Marc Weber <marco-oweber@gmx.de> | 2008-06-08 21:41:07 +0000 |
commit | 620138ad0cfddab82c7e7a42f0e30eedbd24fff7 (patch) | |
tree | d82ec398b311dfdb72f49a805030ccbc731fc00a | |
parent | 2430f8e5620a6cd48b60e1b55ec54c54518c2dcf (diff) |
removed libixp-0.3 (wmiimenu does also build with 0.4)
wmii updated svn path=/nixpkgs/trunk/; revision=12011
-rw-r--r-- | pkgs/applications/window-managers/wmii/default.nix | 15 | ||||
-rw-r--r-- | pkgs/development/libraries/libixp/libixp-0.3.nix | 12 | ||||
-rw-r--r-- | pkgs/development/libraries/libixp_for_wmii/default.nix | 10 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 9 |
4 files changed, 19 insertions, 27 deletions
diff --git a/pkgs/applications/window-managers/wmii/default.nix b/pkgs/applications/window-managers/wmii/default.nix index a6148e3a4da08..396f69181b69a 100644 --- a/pkgs/applications/window-managers/wmii/default.nix +++ b/pkgs/applications/window-managers/wmii/default.nix @@ -2,25 +2,30 @@ args: with args; stdenv.mkDerivation { name = "wmii-20070516"; src = fetchurl { - url = http://www.suckless.org/snaps/wmii-snap20070304.tgz; - sha256 = "01ba1qk48n6wgpnavdwakgwmv895jvqvi75sm2wsvd6bqmc2xp86"; + url = http://www.suckless.org/download/wmii-3.6.tar.gz; + sha256 = "05mj651yv02rvkpqqkgwp8307nrrqpcwfv5k8186kx2yiiw9pws6"; }; - buildInputs = [ libX11 libixp ]; + buildInputs = [ libX11 libixp xextproto libXt libXext ]; inherit libixp; phases = "unpackPhase installPhase"; installPhase = " + for i in libfmt libutf libregexp libbio; do + cd $i; make; cd .. + done + mkdir -p \$out/lib + cp ${libixp}/lib/libixp.a \$out/lib export CFLAGS=\$NIX_CFLAGS_COMPILE export LDFLAGS\=$(echo \$NIX_LDFLAGS | sed -e 's/-rpath/-L/g') sed -i -e \"s%^PREFIX.*%PREFIX=\$out%\" \\ -e \"s%^\\(INCS.*\\)%\\1 \$NIX_CFLAGS_COMPILE%\" \\ -e \"s%^\\(LIBS.*\\)%\\1 \$LDFLAGS%\" \\ - -e 's%^\\(AWKPATH = \\).*%\\1${gawk}/bin/gawk%' \\ + -e 's%^\\(AWKPATH = \\).*%\\1${gawk}/bin/gawk%' \\ config.mk # don't use the default one installed by nixos! - sed -i -e \"s%ixpc%\$libixp/bin/ixpc%\" wmiir + #sed -i -e \"s%ixpc%\$libixp/bin/ixpc%\" wmiir make install "; meta = { homepage = "www.suckless.org"; diff --git a/pkgs/development/libraries/libixp/libixp-0.3.nix b/pkgs/development/libraries/libixp/libixp-0.3.nix deleted file mode 100644 index b56c7d15cca63..0000000000000 --- a/pkgs/development/libraries/libixp/libixp-0.3.nix +++ /dev/null @@ -1,12 +0,0 @@ -{stdenv, fetchurl}: - -stdenv.mkDerivation { - name = "libixp-0.3"; - description = "libixp is a stand-alone client/server 9P library including ixpc client which behaves like wmiir in the past. Its server api is based heavily on Plan 9's lib9p"; - builder = ./builder.sh; - src = fetchurl { - url = http://www.suckless.org/snaps/libixp-0.3.tar.gz; - md5 = "d341eb9c8f5d233aba5aa2ea8295ca91"; - }; -} - diff --git a/pkgs/development/libraries/libixp_for_wmii/default.nix b/pkgs/development/libraries/libixp_for_wmii/default.nix index 6ee94a52dd204..c3fcd0d8100c1 100644 --- a/pkgs/development/libraries/libixp_for_wmii/default.nix +++ b/pkgs/development/libraries/libixp_for_wmii/default.nix @@ -3,16 +3,18 @@ stdenv.mkDerivation { name = "libixp_for_wmii"; phases = "unpackPhase installPhase"; installPhase = " - export LDFLAGS\=$(echo \$NIX_LDFLAGS | sed -e 's/-rpath/-L/g') sed -i -e \"s%^PREFIX.*%PREFIX=\$out%\" \\ -e \"s%^\\(INCLUDE.*\\)%\\1 \$NIX_CFLAGS_COMPILE%\" \\ -e \"s%^\\(LIBS.*\\)%\\1 \$LDFLAGS%\" \\ config.mk - make install + make + mkdir -p \$out/include + cp -r include/*.h \$out/include + cp -r lib \$out "; src = fetchurl { - url = http://www.suckless.org/snaps/libixp-20070220.tar.gz; - sha256 = "0bhqgrxp0lnwyf3c9165nldyw300mifyh0mlyfg1i5qr54rk7p79"; + url = http://www.suckless.org/download/libixp-0.4.tar.gz; + sha256 = "0b44p9wvmzxpyf2xd86rxyr49bmfh9cd5hj3d234gkvynvgph60p"; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cffe12b5e1736..1e1c78e866ab7 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 { |