From 39e4396ea76897143e440a1ecd3b4fedc0320bc2 Mon Sep 17 00:00:00 2001 From: Adrian Kummerlaender Date: Mon, 11 Feb 2019 22:40:14 +0100 Subject: [PATCH 1/3] rocs: init at 18.12.0 --- maintainers/maintainer-list.nix | 6 +++++- pkgs/applications/kde/default.nix | 1 + pkgs/applications/kde/rocs.nix | 25 +++++++++++++++++++++++++ 3 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 pkgs/applications/kde/rocs.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index cc121c15ac8..0e4e22e3791 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2434,7 +2434,11 @@ name = "Karl Meakin"; github = "Kmeakin"; }; - + knairda = { + email = "adrian@kummerlaender.eu"; + name = "Adrian Kummerlaender"; + github = "KnairdA"; + }; knedlsepp = { email = "josef.kemetmueller@gmail.com"; github = "knedlsepp"; diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index 0822e65c7c0..5ca7bbc276e 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -166,6 +166,7 @@ let pim-data-exporter = callPackage ./pim-data-exporter.nix {}; pim-sieve-editor = callPackage ./pim-sieve-editor.nix {}; print-manager = callPackage ./print-manager.nix {}; + rocs = callPackage ./rocs.nix {}; spectacle = callPackage ./spectacle.nix {}; # Okteta was removed from kde applications and will now be released independently # Lets keep an alias for compatibility reasons diff --git a/pkgs/applications/kde/rocs.nix b/pkgs/applications/kde/rocs.nix new file mode 100644 index 00000000000..45bc39fbb1c --- /dev/null +++ b/pkgs/applications/kde/rocs.nix @@ -0,0 +1,25 @@ +{ + stdenv, mkDerivation, makeWrapper, lib, + extra-cmake-modules, boost, + qtbase, qtscript, qtquickcontrols, qtwebkit, qtxmlpatterns, grantlee, + kdoctools, karchive, kxmlgui, kcrash, kdeclarative, ktexteditor, kguiaddons +}: + +mkDerivation { + name = "rocs"; + nativeBuildInputs = [ extra-cmake-modules makeWrapper kdoctools ]; + buildInputs = [ + boost + qtbase qtscript qtquickcontrols qtwebkit qtxmlpatterns grantlee + kxmlgui kcrash kdeclarative karchive ktexteditor kguiaddons + ]; + postInstall = '' + wrapProgram $out/bin/rocs --prefix QT_PLUGIN_PATH ":" "${qtbase.bin}/${qtbase.qtPluginPrefix}:$out/${qtbase.qtPluginPrefix}" + ''; + meta = with lib; { + homepage = http://www.kde.org; + license = with licenses; [ gpl2 lgpl21 fdl12 ]; + platforms = lib.platforms.linux; + maintainers = with maintainers; [ knairda ]; + }; +} From 026a23713ec3abac8edaf160931ce13397dc1bdc Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 28 Sep 2019 14:16:13 -0500 Subject: [PATCH 2/3] rocs: Remove wrapper --- pkgs/applications/kde/rocs.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/applications/kde/rocs.nix b/pkgs/applications/kde/rocs.nix index 45bc39fbb1c..0c007b3f09b 100644 --- a/pkgs/applications/kde/rocs.nix +++ b/pkgs/applications/kde/rocs.nix @@ -1,5 +1,5 @@ { - stdenv, mkDerivation, makeWrapper, lib, + mkDerivation, lib, extra-cmake-modules, boost, qtbase, qtscript, qtquickcontrols, qtwebkit, qtxmlpatterns, grantlee, kdoctools, karchive, kxmlgui, kcrash, kdeclarative, ktexteditor, kguiaddons @@ -13,9 +13,6 @@ mkDerivation { qtbase qtscript qtquickcontrols qtwebkit qtxmlpatterns grantlee kxmlgui kcrash kdeclarative karchive ktexteditor kguiaddons ]; - postInstall = '' - wrapProgram $out/bin/rocs --prefix QT_PLUGIN_PATH ":" "${qtbase.bin}/${qtbase.qtPluginPrefix}:$out/${qtbase.qtPluginPrefix}" - ''; meta = with lib; { homepage = http://www.kde.org; license = with licenses; [ gpl2 lgpl21 fdl12 ]; From 4dc1971211d61ae5a16bea26ea56dc36f3a3e55a Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 28 Sep 2019 14:16:39 -0500 Subject: [PATCH 3/3] rocs: Fix meta --- pkgs/applications/kde/rocs.nix | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/kde/rocs.nix b/pkgs/applications/kde/rocs.nix index 0c007b3f09b..feae7ca81de 100644 --- a/pkgs/applications/kde/rocs.nix +++ b/pkgs/applications/kde/rocs.nix @@ -7,16 +7,19 @@ mkDerivation { name = "rocs"; - nativeBuildInputs = [ extra-cmake-modules makeWrapper kdoctools ]; + + meta = with lib; { + homepage = "https://edu.kde.org/rocs/"; + description = "A graph theory IDE."; + license = with licenses; [ gpl2 lgpl21 fdl12 ]; + platforms = lib.platforms.linux; + maintainers = with maintainers; [ knairda ]; + }; + + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ boost qtbase qtscript qtquickcontrols qtwebkit qtxmlpatterns grantlee kxmlgui kcrash kdeclarative karchive ktexteditor kguiaddons ]; - meta = with lib; { - homepage = http://www.kde.org; - license = with licenses; [ gpl2 lgpl21 fdl12 ]; - platforms = lib.platforms.linux; - maintainers = with maintainers; [ knairda ]; - }; }