git.iko.soy/typeable/nixpkgs
on master help sign in
manuskript: fix build and use wrapQtApp
commitcd67dd52d286f7e2c199e774089605b2e16f5187 authorFabian Möller <fabianm88@gmail.com> dateThu 12 Sep 2019, 12:23 (7 years ago) parent6759d15
2 files changed+10−2
pkgs/applications/editors/manuskript/default.nix+9−1 pkgs/top-level/all-packages.nix+1−1
pkgs/applications/editors/manuskript/default.nix+9−1
@@ -1,9 +1,11 @@
1−{ stdenv, zlib, fetchFromGitHub, python3Packages }:
1+{ stdenv, zlib, fetchFromGitHub, python3Packages, wrapQtAppsHook }:
22
33python3Packages.buildPythonApplication rec {
44 pname = "manuskript";
55 version = "0.9.0";
66
7+ format = "other";
8+
79 src = fetchFromGitHub {
810 repo = pname;
911 owner = "olivierkes";
@@ -11,6 +13,8 @@ python3Packages.buildPythonApplication rec {
1113 sha256 = "13y1s0kba1ib6g977n7h920kyr7abdw03kpal512m7iwa9g2kdw8";
1214 };
1315
16+ nativeBuildInputs = [ wrapQtAppsHook ];
17+
1418 propagatedBuildInputs = [
1519 python3Packages.pyqt5
1620 python3Packages.lxml
@@ -30,6 +34,10 @@ python3Packages.buildPythonApplication rec {
3034 cp -r sample-projects/ $out/share/${pname}
3135 '';
3236
37+ postFixup = ''
38+ wrapQtApp $out/bin/manuskript
39+ '';
40+
3341 doCheck = false;
3442
3543 meta = {
pkgs/top-level/all-packages.nix+1−1
@@ -18453,7 +18453,7 @@ in
1845318453
1845418454 m32edit = callPackage ../applications/audio/midas/m32edit.nix {};
1845518455
18456− manuskript = callPackage ../applications/editors/manuskript { };
18456+ manuskript = libsForQt5.callPackage ../applications/editors/manuskript { };
1845718457
1845818458 manul = callPackage ../development/tools/manul { };
1845918459