nur-packages

My NUR packages
git clone git://git.sikmir.ru/nur-packages
Log | Files | Refs | README | LICENSE

commit 0307e76dc2e4f705a1fe1c3eb325d5c1eeacf836
parent 37c6241dec448cd094f248fa784e7af8157f7b20
Author: Nikolay Korotkiy <sikmir@gmail.com>
Date:   Sun, 15 Nov 2020 22:09:43 +0300

Move qvge to nixpkgs

Diffstat:
Mnix/sources.json | 14--------------
Dpkgs/applications/qvge/default.nix | 39---------------------------------------
Dpkgs/applications/qvge/fix-config.patch | 53-----------------------------------------------------
3 files changed, 0 insertions(+), 106 deletions(-)

diff --git a/nix/sources.json b/nix/sources.json @@ -786,20 +786,6 @@ "url": "https://github.com/tumic0/QtPBFImagePlugin-styles/archive/577bb119641c80e1736815ed70a0b99c942c63e0.tar.gz", "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" }, - "qvge": { - "branch": "master", - "builtin": false, - "date": "2020-08-21T06:52:43Z", - "description": "Qt Visual Graph Editor", - "homepage": "https://arsmasiuk.github.io/qvge/", - "owner": "ArsMasiuk", - "repo": "qvge", - "rev": "1fc861f939a7fb28d7159fa9621197a27e8f486c", - "sha256": "19cafjf7qwjr8c6kyiaqc48xwb8xf18blbrna11skaby6k4by68n", - "type": "tarball", - "url": "https://github.com/ArsMasiuk/qvge/archive/1fc861f939a7fb28d7159fa9621197a27e8f486c.tar.gz", - "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" - }, "redict": { "branch": "master", "builtin": false, diff --git a/pkgs/applications/qvge/default.nix b/pkgs/applications/qvge/default.nix @@ -1,39 +0,0 @@ -{ lib -, stdenv -, mkDerivation -, substituteAll -, ogdf -, qmake -, qtx11extras -, sources -}: -let - pname = "qvge"; - date = lib.substring 0 10 sources.qvge.date; - version = "unstable-" + date; -in -mkDerivation { - inherit pname version; - src = sources.qvge; - - patches = (substituteAll { - src = ./fix-config.patch; - inherit ogdf; - }); - - preConfigure = "cd src"; - - nativeBuildInputs = [ qmake ]; - - buildInputs = [ ogdf qtx11extras ]; - - qmakeFlags = [ "-r" ]; - - meta = with lib; { - inherit (sources.qvge) description homepage; - license = licenses.mit; - maintainers = [ maintainers.sikmir ]; - platforms = with platforms; linux; - skip.ci = stdenv.isDarwin; - }; -} diff --git a/pkgs/applications/qvge/fix-config.patch b/pkgs/applications/qvge/fix-config.patch @@ -1,53 +0,0 @@ -diff --git i/src/app.pri w/src/app.pri -index 83ef422..3658b52 100644 ---- i/src/app.pri -+++ w/src/app.pri -@@ -27,7 +27,7 @@ USE_LOCAL_OGDF{ - } - - USE_EXTERNAL_OGDF{ -- LIBS += -l$$OGDF_LIB_NAME -L$$OGDF_LIB_PATH -+ LIBS += $$OGDF_LIB_PATH/libOGDF.a $$OGDF_LIB_PATH/libCOIN.a - INCLUDEPATH += $$OGDF_INCLUDE_PATH - } - -diff --git i/src/config.pri w/src/config.pri -index 64e585f..d506d84 100644 ---- i/src/config.pri -+++ w/src/config.pri -@@ -5,9 +5,9 @@ - # - # It can be used freely, maintaining the information above. - --CONFIG += BUILD_OGDF -+#CONFIG += BUILD_OGDF - #CONFIG += USE_LOCAL_OGDF --#CONFIG += USE_EXTERNAL_OGDF -+CONFIG += USE_EXTERNAL_OGDF - - BUILD_OGDF{ - CONFIG += USE_LOCAL_OGDF -@@ -31,8 +31,8 @@ USE_EXTERNAL_OGDF{ - - # system-specific OGDF setup - OGDF_LIB_NAME = ogdf -- OGDF_LIB_PATH = -- OGDF_INCLUDE_PATH = /usr/share/ogdf/include -+ OGDF_LIB_PATH = @ogdf@/lib -+ OGDF_INCLUDE_PATH = @ogdf@/include - } - - USE_OGDF{ -diff --git i/src/qvgeapp/qvgeapp.pro w/src/qvgeapp/qvgeapp.pro -index 86135f6..dbce621 100644 ---- i/src/qvgeapp/qvgeapp.pro -+++ w/src/qvgeapp/qvgeapp.pro -@@ -55,7 +55,7 @@ unix{ - desktop.files = $$PWD/linux/qvge.desktop - INSTALLS += desktop - -- icon.path = $PREFIX_DIR/share/pixmaps -+ icon.path = $$PREFIX_DIR/share/pixmaps - icon.files = $$PWD/linux/qvge.png - INSTALLS += icon -