Merge pull request #39166 from xeji/p/gede

gede: 2.0.4 -> 2.6.1, fix ctags dependency
This commit is contained in:
Will Dietz 2018-04-19 13:31:05 -05:00 committed by GitHub
commit 7287129e51
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -2,16 +2,16 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gede-${version}"; name = "gede-${version}";
version = "2.0.4"; version = "2.6.1";
src = fetchurl { src = fetchurl {
url = "http://gede.acidron.com/uploads/source/${name}.tar.xz"; url = "http://gede.acidron.com/uploads/source/${name}.tar.xz";
sha256 = "0ip86ss35sc330p4aykv5qj74jbdwh38i928w1bxb6g3w0xmfqba"; sha256 = "0jallpchl3c3i90hwic4n7n0ggk5wra0fki4by9ag26ln0k42c4r";
}; };
nativeBuildInputs = [ makeWrapper python ]; nativeBuildInputs = [ makeWrapper python ];
buildInputs = [ qt4 ]; buildInputs = [ qt4 ctags ];
postPatch = '' postPatch = ''
sed -i build.py -e 's,qmake-qt4,qmake,' sed -i build.py -e 's,qmake-qt4,qmake,'
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
buildPhase = ":"; buildPhase = ":";
installPhase = '' installPhase = ''
python build.py install --prefix="$out" python build.py install --verbose --prefix="$out"
wrapProgram $out/bin/gede \ wrapProgram $out/bin/gede \
--prefix PATH : ${stdenv.lib.makeBinPath [ ctags gdb ]} --prefix PATH : ${stdenv.lib.makeBinPath [ ctags gdb ]}
''; '';