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: aa1151c0d9b8
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: b7e1cdd95a38
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Jan 17, 2020

  1. skanlite: use qt5's mkDerivaiton 

    (cherry picked from commit 4b20959)
    @worldofpeace
    worldofpeace committed Jan 17, 2020
    Copy the full SHA
    ed422d8 View commit details

  2. skanlite: don't set enableParallelBuilding 

    it's default on

(cherry picked from commit ac96ba0)
    @worldofpeace
    worldofpeace committed Jan 17, 2020
    Copy the full SHA
    b7e1cdd View commit details
Showing with 2 additions and 4 deletions.
  1. +2 −4 pkgs/applications/office/skanlite/default.nix
6 changes: 2 additions & 4 deletions pkgs/applications/office/skanlite/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, cmake, extra-cmake-modules, qtbase,
{ stdenv, mkDerivation, fetchurl, cmake, extra-cmake-modules, qtbase,
kcoreaddons, kdoctools, ki18n, kio, kxmlgui, ktextwidgets,
libksane
}:

let
minorVersion = "2.0";
in stdenv.mkDerivation rec {
in mkDerivation rec {
name = "skanlite-2.0.1";

src = fetchurl {
@@ -21,8 +21,6 @@ in stdenv.mkDerivation rec {
libksane
];

enableParallelBuilding = true;

meta = with stdenv.lib; {
description = "KDE simple image scanning application";
homepage = http://www.kde.org/applications/graphics/skanlite/;