uboot: (firmwareOdroidC2/C4) don't invoke patch tool, use patches = [] instead
https://github.com/NixOS/nixpkgs/blob/master/pkgs/stdenv/generic/setup.sh#L948 this can do it nicely. Signed-off-by: Anton Arapov <anton@deadbeef.mx>
This commit is contained in:
commit
56de2bcd43
30691 changed files with 3076956 additions and 0 deletions
46
pkgs/applications/office/kitsas/default.nix
Normal file
46
pkgs/applications/office/kitsas/default.nix
Normal file
|
|
@ -0,0 +1,46 @@
|
|||
{ lib, stdenv, fetchFromGitHub, qmake, qtbase, qtsvg, poppler, libzip, pkg-config, wrapQtAppsHook }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "kitsas";
|
||||
version = "3.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "artoh";
|
||||
repo = "kitupiikki";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-nmlGLrVsTQawYHNgaax9EiutL4xgFdOD34Q4/rnB/D0=";
|
||||
};
|
||||
|
||||
# QList::swapItemsAt was introduced in Qt 5.13
|
||||
patches = lib.optional (lib.versionOlder qtbase.version "5.13") ./qt-512.patch;
|
||||
|
||||
nativeBuildInputs = [ pkg-config qmake wrapQtAppsHook ];
|
||||
|
||||
buildInputs = [ qtsvg poppler libzip ];
|
||||
|
||||
# We use a separate build-dir as otherwise ld seems to get confused between
|
||||
# directory and executable name on buildPhase.
|
||||
preConfigure = ''
|
||||
mkdir build && cd build
|
||||
'';
|
||||
|
||||
qmakeFlags = [ "../kitsas/kitsas.pro" ];
|
||||
|
||||
installPhase = if stdenv.isDarwin then ''
|
||||
mkdir -p $out/Applications
|
||||
mv kitsas.app $out/Applications
|
||||
'' else ''
|
||||
install -Dm755 kitsas -t $out/bin
|
||||
install -Dm644 ../kitsas.svg -t $out/share/icons/hicolor/scalable/apps
|
||||
install -Dm644 ../kitsas.png -t $out/share/icons/hicolor/256x256/apps
|
||||
install -Dm644 ../kitsas.desktop -t $out/share/applications
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/artoh/kitupiikki";
|
||||
description = "An accounting tool suitable for Finnish associations and small business";
|
||||
maintainers = with maintainers; [ gspia ];
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
24
pkgs/applications/office/kitsas/qt-512.patch
Normal file
24
pkgs/applications/office/kitsas/qt-512.patch
Normal file
|
|
@ -0,0 +1,24 @@
|
|||
diff --git i/kitsas/apuri/siirtoapuri.cpp w/kitsas/apuri/siirtoapuri.cpp
|
||||
index 9a2c51f3..9565200f 100644
|
||||
--- i/kitsas/apuri/siirtoapuri.cpp
|
||||
+++ w/kitsas/apuri/siirtoapuri.cpp
|
||||
@@ -25,6 +25,7 @@
|
||||
#include "db/tositetyyppimodel.h"
|
||||
#include "tiliote/tiliotekirjaaja.h"
|
||||
|
||||
+#include <QtAlgorithms>
|
||||
#include <QDebug>
|
||||
|
||||
SiirtoApuri::SiirtoApuri(QWidget *parent, Tosite *tosite) :
|
||||
@@ -361,8 +362,9 @@ void SiirtoApuri::laskunmaksu()
|
||||
TositeVienti eka = lista.at(0).toMap();
|
||||
tosite()->asetaPvm(eka.pvm());
|
||||
tosite()->asetaOtsikko( eka.selite() );
|
||||
- if( eka.kreditEuro() )
|
||||
- lista.swapItemsAt(0,1);
|
||||
+ if( eka.kreditEuro() ) {
|
||||
+ qSwap(lista.begin()[0], lista.begin()[1]);
|
||||
+ }
|
||||
tosite()->viennit()->asetaViennit(lista);
|
||||
reset();
|
||||
|
||||
Loading…
Add table
Add a link
Reference in a new issue