From 96a3bbd86fae2de47099d0fc235b7409ce87118f Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Tue, 28 Jun 2016 18:48:25 +0200 Subject: [PATCH] Revert "Merge pull request #16507 from vrthra/unifdef" This reverts commit cab28503ad5e6fb516845890a06e4f8693d0ea16, reversing changes made to 5313f1096a3c634e116bf3f5a71772103b7c4178 (but retaining the meta updates). The update to 2.11 breaks the darwin toolchain, see discussion at https://github.com/NixOS/nixpkgs/pull/16507 Once the issues with 2.11 are worked out, this revert can be reverted. --- .../tools/misc/unifdef/default.nix | 27 ++++++++++--------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/pkgs/development/tools/misc/unifdef/default.nix b/pkgs/development/tools/misc/unifdef/default.nix index 6637c0e09bf..19dd907b73b 100644 --- a/pkgs/development/tools/misc/unifdef/default.nix +++ b/pkgs/development/tools/misc/unifdef/default.nix @@ -1,23 +1,24 @@ -{ stdenv, fetchFromGitHub }: +{ fetchurl, stdenv }: stdenv.mkDerivation rec { - name = "unifdef-${version}"; - version = "2.11"; + name = "unifdef-2.6"; - src = fetchFromGitHub { - owner = "fanf2"; - repo = "unifdef"; - rev = "8697cc11a1bb67c1153ecc556b880d1fdc4b4e00"; - sha256 = "0d842m4zqbl5h8qiga1bp3vdirs01wd878rz0dkf32illkimmg0y"; + src = fetchurl { + url = "https://github.com/fanf2/unifdef/archive/${name}.tar.gz"; + sha256 = "1p5wr5ms9w8kijy9h7qs1mz36dlavdj6ngz2bks588w7a20kcqxj"; }; - makeFlags = [ - "prefix=$(out)" - "DESTDIR=" - ]; + postUnpack = '' + substituteInPlace $sourceRoot/unifdef.c \ + --replace '#include "version.h"' "" + + substituteInPlace $sourceRoot/Makefile \ + --replace "unifdef.c: version.h" "unifdef.c:" + ''; preBuild = '' - echo 'V="${name}"' > version.sh + unset HOME + export DESTDIR=$out ''; meta = with stdenv.lib; {