mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-12-30 23:34:12 +03:00
Merge pull request #99131 from Sohalt/electricsheep
electricsheep: 2.7b33-2017-10-20 -> 3.0.2-2019-10-05, fix build
This commit is contained in:
commit
65d32c97af
@ -4,12 +4,12 @@
|
|||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "electricsheep";
|
pname = "electricsheep";
|
||||||
version = "2.7b33-2017-10-20";
|
version = "3.0.2-2019-10-05";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "scottdraves";
|
owner = "scottdraves";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "c02c19b9364733fc73826e105fc983a89a8b4f40";
|
rev = "37ba0fd692d6581f8fe009ed11c9650cd8174123";
|
||||||
sha256 = "1z49l53j1lhk7ahdy96lm9r0pklwpf2i5s6y2l2rn6l4z8dxkjmk";
|
sha256 = "1z49l53j1lhk7ahdy96lm9r0pklwpf2i5s6y2l2rn6l4z8dxkjmk";
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -29,6 +29,10 @@ stdenv.mkDerivation rec {
|
|||||||
"CPPFLAGS=-I${glee}/include/GL"
|
"CPPFLAGS=-I${glee}/include/GL"
|
||||||
];
|
];
|
||||||
|
|
||||||
|
makeFlags = [
|
||||||
|
''CXXFLAGS+="-DGL_GLEXT_PROTOTYPES"''
|
||||||
|
];
|
||||||
|
|
||||||
preBuild = ''
|
preBuild = ''
|
||||||
sed -i "s|/usr|$out|" Makefile
|
sed -i "s|/usr|$out|" Makefile
|
||||||
'';
|
'';
|
||||||
|
Loading…
Reference in New Issue
Block a user