Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: a2b8b1981954
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: c1090cc3e446
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Oct 12, 2019

  1. qtstyleplugin-kvantum: use wrapQtAppsHook 

    Shouldn't be needed for the style engine itself to work, but it is
needed for `kvantummanager` and `kvantumpreview`.

(cherry picked from commit 30360cb)
    @Shados @worldofpeace
    Shados authored and worldofpeace committed Oct 12, 2019
    Copy the full SHA
    a465b1f View commit details

  2. qtstyleplugin-kvantum{,-qt4}: 0.11.0 -> 0.11.2 

    (cherry picked from commit e89f861)
    @Shados @worldofpeace
    Shados authored and worldofpeace committed Oct 12, 2019
    Copy the full SHA
    c1090cc View commit details
Showing with 13 additions and 7 deletions.
  1. +2 −2 pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix
  2. +11 −5 pkgs/development/libraries/qtstyleplugin-kvantum/default.nix
4 changes: 2 additions & 2 deletions pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,13 +2,13 @@

stdenv.mkDerivation rec {
pname = "qtstyleplugin-kvantum-qt4";
version = "0.11.0";
version = "0.11.2";

src = fetchFromGitHub {
owner = "tsujan";
repo = "Kvantum";
rev = "V${version}";
sha256 = "0aqlv7mj7r9vjm6pvb8pv3cyx35lgz8rjjas3k8wfdr3sqyyy25g";
sha256 = "1jcfv96ws6sm3kc2q8zriwqhry24qbq3zbp8gkqw75wssbv82rmc";
};

nativeBuildInputs = [ qmake4Hook ];
16 changes: 11 additions & 5 deletions pkgs/development/libraries/qtstyleplugin-kvantum/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,24 @@
{ stdenv, fetchFromGitHub, qmake, qtbase, qtsvg, qtx11extras, kwindowsystem, libX11, libXext, qttools }:
{ stdenv, fetchFromGitHub, qmake, qtbase, qtsvg, qtx11extras, kwindowsystem
, libX11, libXext, qttools, wrapQtAppsHook
}:

stdenv.mkDerivation rec {
pname = "qtstyleplugin-kvantum";
version = "0.11.0";
version = "0.11.2";

src = fetchFromGitHub {
owner = "tsujan";
repo = "Kvantum";
rev = "V${version}";
sha256 = "0aqlv7mj7r9vjm6pvb8pv3cyx35lgz8rjjas3k8wfdr3sqyyy25g";
sha256 = "1jcfv96ws6sm3kc2q8zriwqhry24qbq3zbp8gkqw75wssbv82rmc";
};

nativeBuildInputs = [ qmake qttools ];
buildInputs = [ qtbase qtsvg qtx11extras kwindowsystem libX11 libXext ];
nativeBuildInputs = [
qmake qttools wrapQtAppsHook
];
buildInputs = [
qtbase qtsvg qtx11extras kwindowsystem libX11 libXext
];

sourceRoot = "source/Kvantum";