public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests 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
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/window-managers/wmii/default.nix
+1 -1
View File
@@ -9,7 +9,7 @@ args: with args; stdenv.mkDerivation {
buildInputs = [ libX11 libixp ]; buildInputs = [ libX11 libixp ];
inherit libixp; inherit libixp;
phases = (if args.includeUnpack then "unpackPhase " else "")+"installPhase"; phases = "unpackPhase installPhase";
installPhase = " installPhase = "
export CFLAGS=\$NIX_CFLAGS_COMPILE export CFLAGS=\$NIX_CFLAGS_COMPILE
pkgs/applications/window-managers/wmii31/default.nix
+1 -1
View File
@@ -9,7 +9,7 @@ args: with args; stdenv.mkDerivation {
buildInputs = [ libX11 libixp ]; buildInputs = [ libX11 libixp ];
inherit libixp; inherit libixp;
phases = (if args.includeUnpack then "unpackPhase " else "")+"installPhase"; phases = "unpackPhase installPhase";
installPhase = " installPhase = "
export CFLAGS=\$NIX_CFLAGS_COMPILE export CFLAGS=\$NIX_CFLAGS_COMPILE
pkgs/development/libraries/libixp_for_wmii/default.nix
+1 -1
View File
@@ -1,7 +1,7 @@
args: with args; args: with args;
stdenv.mkDerivation { stdenv.mkDerivation {
name = "libixp_for_wmii"; name = "libixp_for_wmii";
phases = (if args.includeUnpack then "unpackPhase " else "")+"installPhase"; phases = "unpackPhase installPhase";
installPhase = " installPhase = "
export LDFLAGS\=$(echo \$NIX_LDFLAGS | sed -e 's/-rpath/-L/g') export LDFLAGS\=$(echo \$NIX_LDFLAGS | sed -e 's/-rpath/-L/g')
pkgs/top-level/all-packages.nix
-3
View File
@@ -2823,7 +2823,6 @@ let pkgs = rec {
libixp_for_wmii = lowPrio (import ../development/libraries/libixp_for_wmii { libixp_for_wmii = lowPrio (import ../development/libraries/libixp_for_wmii {
inherit fetchurl stdenv; inherit fetchurl stdenv;
includeUnpack = getConfig ["stdenv" "includeUnpack"] false;
}); });
libzip = import ../development/libraries/libzip { libzip = import ../development/libraries/libzip {
@@ -5615,14 +5614,12 @@ let pkgs = rec {
libixp = libixp03; libixp = libixp03;
inherit fetchurl /* fetchhg */ stdenv gawk; inherit fetchurl /* fetchhg */ stdenv gawk;
inherit (xlibs) libX11; inherit (xlibs) libX11;
includeUnpack = getConfig ["stdenv" "includeUnpack"] false;
}; };
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;
inherit (xlibs) libX11; inherit (xlibs) libX11;
includeUnpack = getConfig ["stdenv" "includeUnpack"] false;
}; };
wordnet = import ../applications/misc/wordnet { wordnet = import ../applications/misc/wordnet {