diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2018-09-25 10:16:53 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-09-25 10:16:53 +0200 |
commit | aba011fe714a874c93a08fc95a85dd15cf8dba29 (patch) | |
tree | e8562087c4ec00e748d1e6ad6173ffe76477888d | |
parent | 39f20a672ef24f2ab1cc31f2010723016829c5aa (diff) | |
parent | 94d079b6bcf86a2f630e70d25899dcf8efb8f94c (diff) | |
download | nixlib-aba011fe714a874c93a08fc95a85dd15cf8dba29.tar nixlib-aba011fe714a874c93a08fc95a85dd15cf8dba29.tar.gz nixlib-aba011fe714a874c93a08fc95a85dd15cf8dba29.tar.bz2 nixlib-aba011fe714a874c93a08fc95a85dd15cf8dba29.tar.lz nixlib-aba011fe714a874c93a08fc95a85dd15cf8dba29.tar.xz nixlib-aba011fe714a874c93a08fc95a85dd15cf8dba29.tar.zst nixlib-aba011fe714a874c93a08fc95a85dd15cf8dba29.zip |
Merge pull request #47305 from worldofpeace/qgnome
Add adwaita-qt & qgnomeplatform
-rw-r--r-- | pkgs/development/libraries/qgnomeplatform/default.nix | 37 | ||||
-rw-r--r-- | pkgs/misc/themes/adwaita-qt/default.nix | 38 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
3 files changed, 79 insertions, 0 deletions
diff --git a/pkgs/development/libraries/qgnomeplatform/default.nix b/pkgs/development/libraries/qgnomeplatform/default.nix new file mode 100644 index 000000000000..3a3d3e0277c9 --- /dev/null +++ b/pkgs/development/libraries/qgnomeplatform/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchFromGitHub, pkgconfig, gtk3, qtbase, qmake }: + +stdenv.mkDerivation rec { + name = "qgnomeplatform-${version}"; + version = "0.4"; + + src = fetchFromGitHub { + owner = "FedoraQt"; + repo = "QGnomePlatform"; + rev = version; + sha256 = "1403300d435g7ngcxsgnllhryk63nrhl1ahx16b28wkxnh2vi9ly"; + }; + + nativeBuildInputs = [ + pkgconfig + qmake + ]; + + buildInputs = [ + gtk3 + qtbase + ]; + + postPatch = '' + # Fix plugin dir + substituteInPlace qgnomeplatform.pro \ + --replace "\$\$[QT_INSTALL_PLUGINS]" "$out/$qtPluginPrefix" + ''; + + meta = with stdenv.lib; { + description = "QPlatformTheme for a better Qt application inclusion in GNOME"; + homepage = https://github.com/FedoraQt/QGnomePlatform; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ worldofpeace ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/misc/themes/adwaita-qt/default.nix b/pkgs/misc/themes/adwaita-qt/default.nix new file mode 100644 index 000000000000..aade22927f01 --- /dev/null +++ b/pkgs/misc/themes/adwaita-qt/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchFromGitHub, pkgconfig, cmake, ninja, qtbase }: + +stdenv.mkDerivation rec { + pname = "adwaita-qt"; + version = "1.0"; + + name = "${pname}-${version}"; + + src = fetchFromGitHub { + owner = "FedoraQt"; + repo = pname; + rev = version; + sha256 = "0xn8bianmdj15k11mnw52by9vxkmvpqr2s304kl3dbjj1l7v4cd7"; + }; + + nativeBuildInputs = [ + cmake + ninja + ]; + + buildInputs = [ + qtbase + ]; + + postPatch = '' + # Fix plugin dir + substituteInPlace style/CMakeLists.txt \ + --replace "DESTINATION \"\''${QT_PLUGINS_DIR}/styles" "DESTINATION \"$qtPluginPrefix/styles" + ''; + + meta = with stdenv.lib; { + description = "A style to bend Qt applications to look like they belong into GNOME Shell"; + homepage = https://github.com/FedoraQt/adwaita-qt; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ worldofpeace ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 152b5250cba3..36a5410a7d7f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11960,6 +11960,8 @@ with pkgs; qrupdate = callPackage ../development/libraries/qrupdate { }; + qgnomeplatform = libsForQt5.callPackage ../development/libraries/qgnomeplatform { }; + resolv_wrapper = callPackage ../development/libraries/resolv_wrapper { }; rhino = callPackage ../development/libraries/java/rhino { @@ -20586,6 +20588,8 @@ with pkgs; latte-dock = libsForQt5.callPackage ../applications/misc/latte-dock { }; + adwaita-qt = libsForQt5.callPackage ../misc/themes/adwaita-qt { }; + orion = callPackage ../misc/themes/orion {}; elementary-gtk-theme = callPackage ../misc/themes/elementary { }; |