From 46f7027688b046f5803c7bd31fdcebf2cae6541e Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 16 Mar 2009 10:00:26 +0000 Subject: [PATCH] * Reverted r14547, r14526 -> these belong in the stdenv-branch. svn path=/nixpkgs/trunk/; revision=14549 --- pkgs/development/interpreters/perl-5.10/default.nix | 2 -- pkgs/tools/misc/coreutils/default.nix | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/interpreters/perl-5.10/default.nix b/pkgs/development/interpreters/perl-5.10/default.nix index 486bb8f5484..cb479c97be2 100644 --- a/pkgs/development/interpreters/perl-5.10/default.nix +++ b/pkgs/development/interpreters/perl-5.10/default.nix @@ -9,8 +9,6 @@ stdenv.mkDerivation { sha256 = "0bivbz15x02m02gqs6hs77cgjr2msfrhnvp5xqk359jg6w6llill"; }; - NIX_CFLAGS_COMPILE = if stdenv.system == "x86_64-linux" then "-fPIC" else ""; - patches = [ # This patch does the following: # 1) Do use the PATH environment variable to find the `pwd' command. diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index 8f4431fc604..a23f20bb244 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -4,8 +4,8 @@ stdenv.mkDerivation { name = "coreutils-6.12"; src = fetchurl { - url = mirror://gnu/coreutils/coreutils-7.1.tar.gz; - sha256 = "019a7kccrdnim2xigwsgc8dhiw0hb1y9q4344qs5z24sl6gv2g41"; + url = mirror://gnu/coreutils/coreutils-6.12.tar.gz; + sha256 = "12pi7i2mxff5jab48pqpwlz2pi0j6sp9p7bgrcl663iiw81zglj9"; }; meta = {