Unverified Commit a4d57bd4 authored by Peder Bergebakken Sundt's avatar Peder Bergebakken Sundt Committed by GitHub
Browse files

Merge pull request #294939 from FliegendeWurst/kcolorpicker-0.3.1 

kcolorpicker: 0.3.0 -> 0.3.1 & kimageannotator: 0.7.0 -> 0.7.1
parents f4e4674e a805ae9f

pkgs/development/libraries/kcolorpicker/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -4,13 +4,13 @@ let 
  isQt6 = lib.versions.major qtbase.version == "6";

in stdenv.mkDerivation rec {

  pname = "kcolorpicker";

  version = "0.3.0";

  version = "0.3.1";



  src = fetchFromGitHub {

    owner = "ksnip";

    repo = "kColorPicker";

    rev = "v${version}";

    hash = "sha256-gkjlIiLB3/074EEFrQUa0djvVt/C44O3afqqNis64P0=";

    hash = "sha256-FG/A4pDNuhGPOeJNZlsnX3paEy4ibJVWKxn8rVUGpN8=";

  };



  nativeBuildInputs = [ cmake ];

pkgs/development/libraries/kimageannotator/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -4,13 +4,13 @@ let 
  isQt6 = lib.versions.major qtbase.version == "6";

in stdenv.mkDerivation rec {

  pname = "kimageannotator";

  version = "0.7.0";

  version = "0.7.1";



  src = fetchFromGitHub {

    owner = "ksnip";

    repo = "kImageAnnotator";

    rev = "v${version}";

    hash = "sha256-Dq9CM/D3nA7MaY9rfwqF/UAw/+1ptKLf3P8jhFdngKk=";

    hash = "sha256-LFou8gTF/XDBLNQbA4uurYJHQl7yOTKe2OGklUsmPrg=";

  };



  nativeBuildInputs = [ cmake qttools ];

pkgs/tools/misc/ksnip/default.nix

+0 −4
Original line number Diff line number Diff line
@@ -31,10 +31,6 @@ stdenv.mkDerivation rec { 
    })

  ];



  postPatch = ''

    substituteInPlace src/CMakeLists.txt --replace-fail "kColorPicker::kColorPicker" "kColorPicker::kColorPicker-Qt5"

  '';



  nativeBuildInputs = [

    cmake

    extra-cmake-modules