diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2006-12-27 18:26:23 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2006-12-27 18:26:23 +0000 |
| commit | cd32e67b2b9ba9f9ad2c364a25c01a632ef0c084 (patch) | |
| tree | 3ca8316a73f0545085476588bbc8ef5d02618504 /pkgs/os-specific | |
| parent | bbe62e266b127e7e99a5c2aee95ad96f9c55c03c (diff) | |
| download | nixlib-cd32e67b2b9ba9f9ad2c364a25c01a632ef0c084.tar nixlib-cd32e67b2b9ba9f9ad2c364a25c01a632ef0c084.tar.gz nixlib-cd32e67b2b9ba9f9ad2c364a25c01a632ef0c084.tar.bz2 nixlib-cd32e67b2b9ba9f9ad2c364a25c01a632ef0c084.tar.lz nixlib-cd32e67b2b9ba9f9ad2c364a25c01a632ef0c084.tar.xz nixlib-cd32e67b2b9ba9f9ad2c364a25c01a632ef0c084.tar.zst nixlib-cd32e67b2b9ba9f9ad2c364a25c01a632ef0c084.zip | |
* Remove makeFlags/installFlags redundancy.
svn path=/nixpkgs/trunk/; revision=7501
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/linux/klibc/builder.sh | 2 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/udev/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/util-linux/default.nix | 1 |
3 files changed, 1 insertions, 4 deletions
diff --git a/pkgs/os-specific/linux/klibc/builder.sh b/pkgs/os-specific/linux/klibc/builder.sh index a6e7abf82015..ef101b466f17 100644 --- a/pkgs/os-specific/linux/klibc/builder.sh +++ b/pkgs/os-specific/linux/klibc/builder.sh @@ -8,6 +8,4 @@ preBuild() { makeFlagsArray=(V=1 prefix=$out SHLIBDIR=$out/lib) -installFlagsArray=("${makeFlagsArray[@]}") - genericBuild diff --git a/pkgs/os-specific/linux/udev/default.nix b/pkgs/os-specific/linux/udev/default.nix index b5a094298f65..67d7fb491f46 100644 --- a/pkgs/os-specific/linux/udev/default.nix +++ b/pkgs/os-specific/linux/udev/default.nix @@ -7,5 +7,5 @@ stdenv.mkDerivation { md5 = "7360ce47b5ec3f9fa71f18071ecb8b97"; }; preBuild = "makeFlagsArray=(etcdir=$out/etc sbindir=$out/sbin usrbindir=$out/bin usrsbindir=$out/sbin mandir=$out/share/man INSTALL='install -c')"; - preInstall = "installFlagsArray=(\"\${makeFlagsArray[@]}\" udevdir=dummy)"; + preInstall = "installFlagsArray=(udevdir=dummy)"; } diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix index 7392419ca42b..f53ba731ab37 100644 --- a/pkgs/os-specific/linux/util-linux/default.nix +++ b/pkgs/os-specific/linux/util-linux/default.nix @@ -12,7 +12,6 @@ stdenv.mkDerivation { preBuild = " makeFlagsArray=(usrbinexecdir=$out/bin usrsbinexecdir=$out/sbin datadir=$out/share exampledir=$out/share/getopt) - installFlagsArray=(\"\${makeFlagsArray[@]}\") "; # Hack to get static builds to work. |