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

Merge pull request #38826 from vbgl/darwin-yosys

Browse Source 
yosys: fix build on darwin
This commit is contained in:
Daiderd Jordan 2018-04-16 21:12:35 +02:00 committed by GitHub
commit 6f416dc5d3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/science/logic/symbiyosys/default.nix
View File

@ -32,6 +32,6 @@ stdenv.mkDerivation rec {
homepage = https://symbiyosys.readthedocs.io/; homepage = https://symbiyosys.readthedocs.io/;
license = stdenv.lib.licenses.mit; license = stdenv.lib.licenses.mit;
maintainers = with stdenv.lib.maintainers; [ thoughtpolice ]; maintainers = with stdenv.lib.maintainers; [ thoughtpolice ];
platforms = stdenv.lib.platforms.linux; platforms = stdenv.lib.platforms.unix;
}; };
} }

8
pkgs/development/compilers/yosys/default.nix
View File

@ -35,14 +35,18 @@ stdenv.mkDerivation rec {
buildInputs = [ tcl readline libffi python3 bison flex ]; buildInputs = [ tcl readline libffi python3 bison flex ];
patchPhase = '' patchPhase = ''
substituteInPlace ../yosys-abc/Makefile \
--replace 'CC := gcc' ""
substituteInPlace ./Makefile \ substituteInPlace ./Makefile \
--replace 'CXX = clang' "" \
--replace 'ABCMKARGS = CC="$(CXX)"' 'ABCMKARGS =' \
--replace 'echo UNKNOWN' 'echo ${substring 0 10 (elemAt srcs 0).rev}' --replace 'echo UNKNOWN' 'echo ${substring 0 10 (elemAt srcs 0).rev}'
''; '';
preBuild = '' preBuild = ''
chmod -R u+w ../yosys-abc chmod -R u+w ../yosys-abc
ln -s ../yosys-abc abc ln -s ../yosys-abc abc
make config-gcc make config-${if stdenv.cc.isClang or false then "clang" else "gcc"}
echo 'ABCREV := default' >> Makefile.conf echo 'ABCREV := default' >> Makefile.conf
makeFlags="PREFIX=$out $makeFlags" makeFlags="PREFIX=$out $makeFlags"
''; '';
@ -61,6 +65,6 @@ stdenv.mkDerivation rec {
homepage = http://www.clifford.at/yosys/; homepage = http://www.clifford.at/yosys/;
license = stdenv.lib.licenses.isc; license = stdenv.lib.licenses.isc;
maintainers = with stdenv.lib.maintainers; [ shell thoughtpolice ]; maintainers = with stdenv.lib.maintainers; [ shell thoughtpolice ];
platforms = stdenv.lib.platforms.linux; platforms = stdenv.lib.platforms.unix;
}; };
} }