diff options
author | Joerg Thalheim <joerg@thalheim.io> | 2017-10-24 11:29:17 +0100 |
---|---|---|
committer | Joerg Thalheim <joerg@thalheim.io> | 2017-10-24 11:29:17 +0100 |
commit | f6f0b7ac5d10b40962c5e8048dd1df59af8e59bc (patch) | |
tree | 2470c8dc3abca75fa86071524c0b2fbef0596f43 /pkgs/applications/graphics/awesomebump | |
parent | c9e08b578b0a75c378bc69939e5bcb0de8f307fa (diff) | |
download | nixlib-f6f0b7ac5d10b40962c5e8048dd1df59af8e59bc.tar nixlib-f6f0b7ac5d10b40962c5e8048dd1df59af8e59bc.tar.gz nixlib-f6f0b7ac5d10b40962c5e8048dd1df59af8e59bc.tar.bz2 nixlib-f6f0b7ac5d10b40962c5e8048dd1df59af8e59bc.tar.lz nixlib-f6f0b7ac5d10b40962c5e8048dd1df59af8e59bc.tar.xz nixlib-f6f0b7ac5d10b40962c5e8048dd1df59af8e59bc.tar.zst nixlib-f6f0b7ac5d10b40962c5e8048dd1df59af8e59bc.zip |
awesomebump: do not override qmake build phases
then all the hacks are not necessary
Diffstat (limited to 'pkgs/applications/graphics/awesomebump')
-rw-r--r-- | pkgs/applications/graphics/awesomebump/default.nix | 68 |
1 files changed, 35 insertions, 33 deletions
diff --git a/pkgs/applications/graphics/awesomebump/default.nix b/pkgs/applications/graphics/awesomebump/default.nix index 0666788e3e3b..f190b421b056 100644 --- a/pkgs/applications/graphics/awesomebump/default.nix +++ b/pkgs/applications/graphics/awesomebump/default.nix @@ -1,47 +1,49 @@ -{ lib, stdenv, fetchurl, qtbase, qmake, makeWrapper, qtscript, gcc, flex, bison, qtdeclarative, gnutar }: +{ lib, stdenv, fetchgit, qtbase, qmake, makeWrapper, qtscript, gcc, flex, bison, qtdeclarative, gnutar }: -stdenv.mkDerivation { - name = "awesomebump-5.1"; - src = fetchurl { - url = https://github.com/kmkolasinski/AwesomeBump/archive/Winx32v5.1.tar.gz; - sha256 = "04s0jj9gfw1rfr82ga2vw6x1jy00ca9p9s3hh31q3k5h6vg5ailn"; +let + version = "5.1"; + + src = fetchgit { + url = "https://github.com/kmkolasinski/AwesomeBump.git"; + rev = "Winx32v${version}"; + sha256 = "1c8b9jki0v8kzkvsvyv7q1w3s7j40br6ph15hh2xi0a1mpwckq56"; + fetchSubmodules = true; + }; + + qtnproperty = stdenv.mkDerivation { + name = "qtnproperty"; + inherit src; + sourceRoot = "AwesomeBump/Sources/utils/QtnProperty"; + buildInputs = [ qtscript qtbase qtdeclarative ]; + nativeBuildInputs = [ qmake flex bison ]; + postInstall = '' + install -D bin-linux/QtnPEG $out/bin/QtnPEG + ''; }; +in stdenv.mkDerivation rec { + name = "awesomebump-${version}"; - buildInputs = [ qtbase qtscript qtdeclarative flex bison gnutar ]; + inherit src; + + buildInputs = [ qtbase qtscript qtdeclarative ]; nativeBuildInputs = [ qmake makeWrapper ]; - buildPhase = '' - cd Sources/utils/QtnProperty - tar xf "${fetchurl { url = "https://github.com/kmkolasinski/QtnProperty/archive/00e1a9a7cdf6fa84d1b0a35efe752bc2e4a6be1f.tar.gz"; sha256 = "0fdny0khm6jb5816d5xsijp26xrkz2ksz8w9pv1x4hf32l48s9yn"; } }" - mv QtnProperty-*/* . - rm -r QtnProperty-* - alias - $QMAKE Property.pro -r TOP_SRC_DIR=$(pwd) - make - cd ../../../ - $QMAKE - make - cp -vr workdir/`cat workdir/current`/bin/AwesomeBump Bin + preBuild = '' + ln -sf ${qtnproperty}/bin/QtnPEG Sources/utils/QtnProperty/bin-linux/QtnPEG ''; - installPhase = - '' - d=$out/libexec/AwesomeBump - mkdir -p $d $out/bin - cp Bin/AwesomeBump $d/ - cp -prd Bin/Configs Bin/Core $d/ + postInstall = '' + d=$out/libexec/AwesomeBump - # AwesomeBump expects to find Core and Configs in its current - # directory. - makeWrapper $d/AwesomeBump $out/bin/AwesomeBump \ - --run "cd $d" - ''; + mkdir -p $d + cp -vr workdir/`cat workdir/current`/bin/AwesomeBump $d/ + cp -prd Bin/Configs Bin/Core $d/ - # RPATH in /tmp hack - preFixup = '' - rm -r $NIX_BUILD_TOP/__nix_qt5__ + # AwesomeBump expects to find Core and Configs in its current directory. + makeWrapper $d/AwesomeBump $out/bin/AwesomeBump \ + --run "cd $d" ''; meta = { |