diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2021-05-19 14:39:56 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-19 14:39:56 +0200 |
| commit | 633b9193d0cf811faac536c57402624784651213 (patch) | |
| tree | 49b69e1879141d77a968c76deade140f4384dd9a /pkgs/data | |
| parent | 3aaa5c80ab44289d46d32b126ec8be7a8e6fd986 (diff) | |
| parent | dce2a7a763dc97e75e9e68c934545e007f5d7f17 (diff) | |
Merge pull request #123629 from dasj19/adwaita-qt-update
adwaita-qt: 1.1.4 -> 1.3.0
Diffstat (limited to 'pkgs/data')
| -rw-r--r-- | pkgs/data/themes/adwaita-qt/default.nix | 23 |
1 files changed, 18 insertions, 5 deletions
diff --git a/pkgs/data/themes/adwaita-qt/default.nix b/pkgs/data/themes/adwaita-qt/default.nix index 9c71c7871121f..2722c4fe20c99 100644 --- a/pkgs/data/themes/adwaita-qt/default.nix +++ b/pkgs/data/themes/adwaita-qt/default.nix @@ -1,14 +1,24 @@ -{ mkDerivation, lib, fetchFromGitHub, nix-update-script, cmake, ninja, qtbase, pantheon }: +{ mkDerivation +, stdenv +, lib +, fetchFromGitHub +, nix-update-script +, cmake +, ninja +, qtbase +, qt5 +, xorg +}: mkDerivation rec { pname = "adwaita-qt"; - version = "1.1.4"; + version = "1.3.0"; src = fetchFromGitHub { owner = "FedoraQt"; repo = pname; rev = version; - sha256 = "19s97wm96g3828dp8m85j3lsn1n6h5h2zqk4652hcqcgq6xb6gv5"; + sha256 = "1fkivdiz4al84nhgg1srj33l109j9si63biw3asy339cyyzj28c9"; }; nativeBuildInputs = [ @@ -18,11 +28,14 @@ mkDerivation rec { buildInputs = [ qtbase + qt5.qtx11extras + ] ++ lib.optionals stdenv.isLinux [ + xorg.libxcb ]; postPatch = '' # Fix plugin dir - substituteInPlace style/CMakeLists.txt \ + substituteInPlace src/style/CMakeLists.txt \ --replace "DESTINATION \"\''${QT_PLUGINS_DIR}/styles" "DESTINATION \"$qtPluginPrefix/styles" ''; @@ -37,6 +50,6 @@ mkDerivation rec { homepage = "https://github.com/FedoraQt/adwaita-qt"; license = licenses.gpl2Plus; maintainers = teams.gnome.members ++ (with maintainers; [ ]); - platforms = platforms.linux; + platforms = platforms.all; }; } |