awesomebump: use qt5's mkDerivation
Wrap Qt program manually, remove makeWrapper from nativeBuildInputs.
This commit is contained in:
parent
eae808331c
commit
a0a076b857
|
@ -1,4 +1,4 @@
|
||||||
{ lib, stdenv, fetchgit, qtbase, qmake, makeWrapper, qtscript, flex, bison, qtdeclarative }:
|
{ mkDerivation, lib, fetchgit, qtbase, qmake, qtscript, flex, bison, qtdeclarative }:
|
||||||
|
|
||||||
|
|
||||||
let
|
let
|
||||||
|
@ -11,7 +11,7 @@ let
|
||||||
fetchSubmodules = true;
|
fetchSubmodules = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
qtnproperty = stdenv.mkDerivation {
|
qtnproperty = mkDerivation {
|
||||||
name = "qtnproperty";
|
name = "qtnproperty";
|
||||||
inherit src;
|
inherit src;
|
||||||
sourceRoot = "AwesomeBump/Sources/utils/QtnProperty";
|
sourceRoot = "AwesomeBump/Sources/utils/QtnProperty";
|
||||||
|
@ -22,7 +22,7 @@ let
|
||||||
install -D bin-linux/QtnPEG $out/bin/QtnPEG
|
install -D bin-linux/QtnPEG $out/bin/QtnPEG
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
in stdenv.mkDerivation {
|
in mkDerivation {
|
||||||
pname = "awesomebump";
|
pname = "awesomebump";
|
||||||
inherit version;
|
inherit version;
|
||||||
|
|
||||||
|
@ -30,12 +30,13 @@ in stdenv.mkDerivation {
|
||||||
|
|
||||||
buildInputs = [ qtbase qtscript qtdeclarative ];
|
buildInputs = [ qtbase qtscript qtdeclarative ];
|
||||||
|
|
||||||
nativeBuildInputs = [ qmake makeWrapper ];
|
nativeBuildInputs = [ qmake ];
|
||||||
|
|
||||||
preBuild = ''
|
preBuild = ''
|
||||||
ln -sf ${qtnproperty}/bin/QtnPEG Sources/utils/QtnProperty/bin-linux/QtnPEG
|
ln -sf ${qtnproperty}/bin/QtnPEG Sources/utils/QtnProperty/bin-linux/QtnPEG
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
dontWrapQtApps = true;
|
||||||
postInstall = ''
|
postInstall = ''
|
||||||
d=$out/libexec/AwesomeBump
|
d=$out/libexec/AwesomeBump
|
||||||
|
|
||||||
|
@ -44,7 +45,7 @@ in stdenv.mkDerivation {
|
||||||
cp -prd Bin/Configs Bin/Core $d/
|
cp -prd Bin/Configs Bin/Core $d/
|
||||||
|
|
||||||
# AwesomeBump expects to find Core and Configs in its current directory.
|
# AwesomeBump expects to find Core and Configs in its current directory.
|
||||||
makeWrapper $d/AwesomeBump $out/bin/AwesomeBump \
|
makeQtWrapper $d/AwesomeBump $out/bin/AwesomeBump \
|
||||||
--run "cd $d"
|
--run "cd $d"
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue