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

Revert "Merge pull request #16507 from vrthra/unifdef"

Browse Source 
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.
This commit is contained in:
Joachim Fasting 2016-06-28 18:48:25 +02:00
parent 5cec134c70
commit 96a3bbd86f
No known key found for this signature in database
GPG Key ID: 4330820E1E04DCF4
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
pkgs/development/tools/misc/unifdef/default.nix
View File

@ -1,23 +1,24 @@
{ stdenv, fetchFromGitHub }: { fetchurl, stdenv }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "unifdef-${version}"; name = "unifdef-2.6";
version = "2.11";
src = fetchFromGitHub { src = fetchurl {
owner = "fanf2"; url = "https://github.com/fanf2/unifdef/archive/${name}.tar.gz";
repo = "unifdef"; sha256 = "1p5wr5ms9w8kijy9h7qs1mz36dlavdj6ngz2bks588w7a20kcqxj";
rev = "8697cc11a1bb67c1153ecc556b880d1fdc4b4e00";
sha256 = "0d842m4zqbl5h8qiga1bp3vdirs01wd878rz0dkf32illkimmg0y";
}; };
makeFlags = [ postUnpack = ''
"prefix=$(out)" substituteInPlace $sourceRoot/unifdef.c \
"DESTDIR=" --replace '#include "version.h"' ""
];
substituteInPlace $sourceRoot/Makefile \
--replace "unifdef.c: version.h" "unifdef.c:"
'';
preBuild = '' preBuild = ''
echo 'V="${name}"' > version.sh unset HOME
export DESTDIR=$out
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {