qt5: remove makeQtWrapper

This commit is contained in:
Thomas Tuegel
2017-06-18 08:44:42 -05:00
parent 1607f51613
commit c816bbc8a8
92 changed files with 323 additions and 582 deletions
+2 -3
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, qmake, qtbase, qttools, makeQtWrapper }:
{ stdenv, fetchFromGitHub, qmake, qtbase, qttools }:
stdenv.mkDerivation rec {
name = "gpxsee-${version}";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "17s1v6b1j7pi0yj554bd0cg14bl854gssp5gj2pl51rxji6zr0wp";
};
nativeBuildInputs = [ qmake qttools makeQtWrapper ];
nativeBuildInputs = [ qmake qttools ];
preConfigure = ''
substituteInPlace src/config.h --replace /usr/share/gpxsee $out/share/gpxsee
@@ -20,7 +20,6 @@ stdenv.mkDerivation rec {
preFixup = ''
install -Dm755 GPXSee $out/bin/GPXSee
wrapQtProgram $out/bin/GPXSee
mkdir -p $out/share/gpxsee
cp pkg/maps.txt $out/share/gpxsee