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

refactor

Browse Source 
svn path=/nixpkgs/trunk/; revision=6006
This commit is contained in:
Armijn Hemel 2006-07-31 15:12:08 +00:00
parent faf05a6811
commit 6f1e09951c
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/os-specific/linux/e2fsprogs-diet/builder.sh
View File

@ -1,7 +1,5 @@
source $stdenv/setup source $stdenv/setup
export NIX_GLIBC_FLAGS_SET=1
installPhase() { installPhase() {
make install make install
cd lib/uuid; make install cd lib/uuid; make install

3
pkgs/os-specific/linux/e2fsprogs-diet/default.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, gettext, dietgcc}: {stdenv, fetchurl, gettext}:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "e2fsprogs-1.36"; name = "e2fsprogs-1.36";
@ -8,5 +8,4 @@ stdenv.mkDerivation {
md5 = "1804ee96b76e5e7113fe3cecd6fe582b"; md5 = "1804ee96b76e5e7113fe3cecd6fe582b";
}; };
buildInputs = [gettext]; buildInputs = [gettext];
NIX_GCC = dietgcc;
} }

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

@ -1930,7 +1930,8 @@ rec {
}; };
e2fsprogsDiet = (import ../os-specific/linux/e2fsprogs-diet) { e2fsprogsDiet = (import ../os-specific/linux/e2fsprogs-diet) {
inherit fetchurl stdenv gettext dietgcc; inherit fetchurl gettext;
stdenv = overrideGCC stdenv dietgcc;
}; };
nettools = (import ../os-specific/linux/net-tools) { nettools = (import ../os-specific/linux/net-tools) {