diff options
author | Thomas Tuegel <ttuegel@mailbox.org> | 2020-04-02 05:48:06 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-04-02 05:48:06 -0500 |
commit | 20937a2202be9ae281551bc6050a4d8a07623157 (patch) | |
tree | 6f0e3ecd113475c9420e3bb1d7d48c80aee59530 | |
parent | 7116a88d26293df14012e0b815a3fe0e2c90828e (diff) | |
parent | 354508b0c5be4b269538672119283c6e5df8398a (diff) | |
download | nixlib-20937a2202be9ae281551bc6050a4d8a07623157.tar nixlib-20937a2202be9ae281551bc6050a4d8a07623157.tar.gz nixlib-20937a2202be9ae281551bc6050a4d8a07623157.tar.bz2 nixlib-20937a2202be9ae281551bc6050a4d8a07623157.tar.lz nixlib-20937a2202be9ae281551bc6050a4d8a07623157.tar.xz nixlib-20937a2202be9ae281551bc6050a4d8a07623157.tar.zst nixlib-20937a2202be9ae281551bc6050a4d8a07623157.zip |
Merge pull request #83152 from s9gf4ult/master
qxmledit: init at 0.9.15
-rw-r--r-- | pkgs/applications/editors/qxmledit/default.nix | 28 | ||||
-rw-r--r-- | pkgs/applications/editors/qxmledit/qxmledit.json | 6 | ||||
-rw-r--r-- | pkgs/development/libraries/qt-5/5.12/default.nix | 1 | ||||
-rw-r--r-- | pkgs/development/libraries/qt-5/modules/qtscxml.nix | 7 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
5 files changed, 44 insertions, 0 deletions
diff --git a/pkgs/applications/editors/qxmledit/default.nix b/pkgs/applications/editors/qxmledit/default.nix new file mode 100644 index 000000000000..9e9766f04e83 --- /dev/null +++ b/pkgs/applications/editors/qxmledit/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub, + qmake, qtbase, qtxmlpatterns, qtsvg, qtscxml, qtquick1, libGLU }: + +stdenv.mkDerivation rec { + name = "qxmledit-${version}" ; + version = "0.9.15" ; + src = fetchFromGitHub ( stdenv.lib.importJSON ./qxmledit.json ) ; + nativeBuildInputs = [ qmake ] ; + buildInputs = [ qtbase qtxmlpatterns qtsvg qtscxml qtquick1 libGLU ] ; + qmakeFlags = [ "CONFIG+=release" ] ; + outputs = [ "out" "doc" ] ; + + preConfigure = '' + export QXMLEDIT_INST_DATA_DIR="$out/share/data" + export QXMLEDIT_INST_TRANSLATIONS_DIR="$out/share/i18n" + export QXMLEDIT_INST_INCLUDE_DIR="$out/include" + export QXMLEDIT_INST_DIR="$out/bin" + export QXMLEDIT_INST_LIB_DIR="$out/lib" + export QXMLEDIT_INST_DOC_DIR="$doc" + ''; + + meta = with stdenv.lib; { + description = "Simple XML editor based on qt libraries" ; + homepage = https://sourceforge.net/projects/qxmledit; + license = licenses.lgpl2; + platforms = platforms.all; + } ; +} diff --git a/pkgs/applications/editors/qxmledit/qxmledit.json b/pkgs/applications/editors/qxmledit/qxmledit.json new file mode 100644 index 000000000000..3b50532d6a0d --- /dev/null +++ b/pkgs/applications/editors/qxmledit/qxmledit.json @@ -0,0 +1,6 @@ +{ + "owner": "lbellonda", + "repo": "qxmledit", + "rev": "6136dca50ceb3b4447c91a7a18dcf84785ea11d1", + "sha256": "1wcnphalwf0a5gz9r44jgk8wcv1w2qipbwjkbzkra2kxanxns834" +} \ No newline at end of file diff --git a/pkgs/development/libraries/qt-5/5.12/default.nix b/pkgs/development/libraries/qt-5/5.12/default.nix index c0bba5e5c010..ab27c2e27873 100644 --- a/pkgs/development/libraries/qt-5/5.12/default.nix +++ b/pkgs/development/libraries/qt-5/5.12/default.nix @@ -150,6 +150,7 @@ let qtserialport = callPackage ../modules/qtserialport.nix {}; qtspeech = callPackage ../modules/qtspeech.nix {}; qtsvg = callPackage ../modules/qtsvg.nix {}; + qtscxml = callPackage ../modules/qtscxml.nix {}; qttools = callPackage ../modules/qttools.nix {}; qttranslations = callPackage ../modules/qttranslations.nix {}; qtvirtualkeyboard = callPackage ../modules/qtvirtualkeyboard.nix {}; diff --git a/pkgs/development/libraries/qt-5/modules/qtscxml.nix b/pkgs/development/libraries/qt-5/modules/qtscxml.nix new file mode 100644 index 000000000000..62b428b08933 --- /dev/null +++ b/pkgs/development/libraries/qt-5/modules/qtscxml.nix @@ -0,0 +1,7 @@ +{ qtModule, qtbase, qtdeclarative }: + +qtModule { + name = "qtscxml"; + qtInputs = [ qtbase qtdeclarative ]; + outputs = [ "out" "dev" "bin" ]; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e5a0e81f4a76..e7aed4b8ebcf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10688,6 +10688,8 @@ in qtcreator = libsForQt5.callPackage ../development/tools/qtcreator { }; + qxmledit = libsForQt5.callPackage ../applications/editors/qxmledit {} ; + r10k = callPackage ../tools/system/r10k { }; inherit (callPackages ../development/tools/analysis/radare2 ({ |