From 6793313708a5eae29c2cda532bd3d1598d73c7be Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Mon, 24 Sep 2018 19:07:51 -0400 Subject: [PATCH 1/2] qgnomeplatform: init at 0.4 --- .../libraries/qgnomeplatform/default.nix | 37 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 39 insertions(+) create mode 100644 pkgs/development/libraries/qgnomeplatform/default.nix diff --git a/pkgs/development/libraries/qgnomeplatform/default.nix b/pkgs/development/libraries/qgnomeplatform/default.nix new file mode 100644 index 00000000000..3a3d3e0277c --- /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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 500a713f22b..699d37095ae 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11953,6 +11953,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 { From 94d079b6bcf86a2f630e70d25899dcf8efb8f94c Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Mon, 24 Sep 2018 22:14:37 -0400 Subject: [PATCH 2/2] adwaita-qt: init at 1.0 --- pkgs/misc/themes/adwaita-qt/default.nix | 38 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 40 insertions(+) create mode 100644 pkgs/misc/themes/adwaita-qt/default.nix diff --git a/pkgs/misc/themes/adwaita-qt/default.nix b/pkgs/misc/themes/adwaita-qt/default.nix new file mode 100644 index 00000000000..aade22927f0 --- /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 699d37095ae..748239b6489 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20578,6 +20578,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 { };