swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-20 20:39:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

removed wmii includeUnpack hack having been used to support old and new setup script

Browse source 
svn path=/nixpkgs/trunk/; revision=11270
This commit is contained in:
Marc Weber 2008-03-23 16:52:27 +00:00
parent 32bc662263
commit 438f35dac0
4 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/applications/window-managers/wmii/default.nix
View file

@ -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

2
pkgs/applications/window-managers/wmii31/default.nix
View file

@ -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

2
pkgs/development/libraries/libixp_for_wmii/default.nix
View file

@ -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')

3
pkgs/top-level/all-packages.nix
View file

@ -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 {