ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-26 21:33:03 +03:00
Code Issues Projects Releases Wiki Activity

awesomebump: use qt5's mkDerivation

Browse Source 
Wrap Qt program manually, remove makeWrapper from nativeBuildInputs.
This commit is contained in:
Martin Milata 2020-04-07 22:32:16 +02:00
parent eae808331c
commit a0a076b857
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/applications/graphics/awesomebump/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchgit, qtbase, qmake, makeWrapper, qtscript, flex, bison, qtdeclarative }:
{ mkDerivation, lib, fetchgit, qtbase, qmake, qtscript, flex, bison, qtdeclarative }:
let
@ -11,7 +11,7 @@ let
fetchSubmodules = true;
};
qtnproperty = stdenv.mkDerivation {
qtnproperty = mkDerivation {
name = "qtnproperty";
inherit src;
sourceRoot = "AwesomeBump/Sources/utils/QtnProperty";
@ -22,7 +22,7 @@ let
install -D bin-linux/QtnPEG $out/bin/QtnPEG
'';
};
in stdenv.mkDerivation {
in mkDerivation {
pname = "awesomebump";
inherit version;
@ -30,12 +30,13 @@ in stdenv.mkDerivation {
buildInputs = [ qtbase qtscript qtdeclarative ];
nativeBuildInputs = [ qmake makeWrapper ];
nativeBuildInputs = [ qmake ];
preBuild = ''
ln -sf ${qtnproperty}/bin/QtnPEG Sources/utils/QtnProperty/bin-linux/QtnPEG
'';
dontWrapQtApps = true;
postInstall = ''
d=$out/libexec/AwesomeBump
@ -44,7 +45,7 @@ in stdenv.mkDerivation {
cp -prd Bin/Configs Bin/Core $d/
# 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"
'';