nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-28 18:03:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2021-05-02 12:24:51 +00:00 committed by GitHub
commit 9ed4bc7275
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
23 changed files with 304 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
maintainers/maintainer-list.nix
View File

@ -10559,7 +10559,12 @@
githubId = 45292658;
name = "Julius Schmitt";
};
vojta001 = {
email = "vojtech.kane@gmail.com";
github = "vojta001";
githubId = 7038383;
name = "Vojta Káně";
};
volhovm = {
email = "volhovm.cs@gmail.com";
github = "volhovm";

4
pkgs/applications/blockchains/bitcoin.nix
View File

@ -22,7 +22,7 @@
with lib;
let
version = "0.21.0";
version = "0.21.1";
majorMinorVersion = versions.majorMinor version;
desktop = fetchurl {
url = "https://raw.githubusercontent.com/bitcoin-core/packaging/${majorMinorVersion}/debian/bitcoin-qt.desktop";
@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
"https://bitcoincore.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz"
"https://bitcoin.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz"
];
sha256 = "1a91202c62ee49fb64d57a52b8d6d01cd392fffcbef257b573800f9289655f37";
sha256 = "caff23449220cf45753f312cefede53a9eac64000bb300797916526236b6a1e0";
};
nativeBuildInputs =

29
pkgs/applications/blockchains/miniscript/default.nix Normal file
View File

@ -0,0 +1,29 @@
{ stdenv, lib, fetchFromGitHub }:
stdenv.mkDerivation rec {
pname = "miniscript";
version = "unstable-2020-12-01";
src = fetchFromGitHub {
owner = "sipa";
repo = pname;
rev = "02682a398a35b410571b10cde7f39837141ddad6";
sha256 = "079jz4g88cfzfm9a6ykby9haxwcs033c1288mgr8cl2hw4qd2sjl";
};
installPhase = ''
runHook preInstall
mkdir -p $out/bin
cp miniscript $out/bin/miniscript
runHook postInstall
'';
meta = with lib; {
description = "Compiler and inspector for the miniscript Bitcoin policy language";
longDescription = "Miniscript is a language for writing (a subset of) Bitcoin Scripts in a structured way, enabling analysis, composition, generic signing and more.";
homepage = "http://bitcoin.sipa.be/miniscript/";
license = licenses.mit;
platforms = platforms.linux;
maintainers = with maintainers; [ RaghavSood jb55 ];
};
}

26
pkgs/applications/blockchains/monero-gui/default.nix
View File

@ -17,22 +17,15 @@
with lib;
let
arch = if stdenv.isx86_64 then "x86-64"
else if stdenv.isi686 then "i686"
else if stdenv.isAarch64 then "armv8-a"
else throw "unsupported architecture";
in
stdenv.mkDerivation rec {
pname = "monero-gui";
version = "0.17.1.9";
version = "0.17.2.1";
src = fetchFromGitHub {
owner = "monero-project";
repo = "monero-gui";
rev = "v${version}";
sha256 = "0143mmxk0jfb5pmjlx6v0knvf8v49kmkpjxlp6rw8lwnlf71xadn";
sha256 = "1apjvpvn6hg0k0ak6wpg4prcdcslnb6fqhzzg2p4iy846f0ai9ji";
};
nativeBuildInputs = [
@ -58,7 +51,10 @@ stdenv.mkDerivation rec {
chmod -R +w source/monero
'';
patches = [ ./move-log-file.patch ];
patches = [
./move-log-file.patch
./use-system-libquirc.patch
];
postPatch = ''
# set monero-gui version
@ -69,17 +65,15 @@ stdenv.mkDerivation rec {
substituteInPlace src/daemon/DaemonManager.cpp \
--replace 'QApplication::applicationDirPath() + "' '"${monero}/bin'
# only build external deps, *not* the full monero
# 1: only build external deps, *not* the full monero
# 2: use nixpkgs libraries
substituteInPlace CMakeLists.txt \
--replace 'add_subdirectory(monero)' \
'add_subdirectory(monero EXCLUDE_FROM_ALL)'
# use nixpkgs quirc
substituteInPlace CMakeLists.txt \
'add_subdirectory(monero EXCLUDE_FROM_ALL)' \
--replace 'add_subdirectory(external)' ""
'';
cmakeFlags = [ "-DARCH=${arch}" ];
cmakeFlags = [ "-DARCH=default" ];
desktopItem = makeDesktopItem {
name = "monero-wallet-gui";

37
pkgs/applications/blockchains/monero-gui/use-system-libquirc.patch Normal file
View File

@ -0,0 +1,37 @@
diff --git a/src/QR-Code-scanner/CMakeLists.txt b/src/QR-Code-scanner/CMakeLists.txt
index 15e288df..2e9b3305 100644
--- a/src/QR-Code-scanner/CMakeLists.txt
+++ b/src/QR-Code-scanner/CMakeLists.txt
@@ -1,11 +1,18 @@
+find_library(QUIRC_LIBRARY quirc REQUIRED)
+find_path(QUIRC_INCLUDE_DIR quirc.h REQUIRED)
+
add_library(qrdecoder STATIC
Decoder.cpp
)
+target_include_directories(qrdecoder
+ PUBLIC
+ ${QUIRC_INCLUDE_DIR}
+)
target_link_libraries(qrdecoder
PUBLIC
Qt5::Gui
PRIVATE
- quirc
+ ${QUIRC_LIBRARY}
)
if(WITH_SCANNER)
diff --git a/src/QR-Code-scanner/Decoder.cpp b/src/QR-Code-scanner/Decoder.cpp
index 1bb99140..353ca189 100644
--- a/src/QR-Code-scanner/Decoder.cpp
+++ b/src/QR-Code-scanner/Decoder.cpp
@@ -30,7 +30,7 @@
#include <limits>
-#include "quirc.h"
+#include <quirc.h>
QrDecoder::QrDecoder()
: m_qr(quirc_new())

4
pkgs/applications/blockchains/monero/default.nix
View File

@ -17,13 +17,13 @@ assert trezorSupport -> all (x: x!=null) [ libusb1 protobuf python3 ];
stdenv.mkDerivation rec {
pname = "monero";
version = "0.17.1.9";
version = "0.17.2.0";
src = fetchFromGitHub {
owner = "monero-project";
repo = "monero";
rev = "v${version}";
sha256 = "0jqss4csvkcrhrmaa3vrnyv6yiwqpbfw7037clx9xcfm4qrrfiwy";
sha256 = "0jwlmrpzisvw1c06cvd5b3s3hd4w0pa1qmrypfwah67qj3x6hnb6";
fetchSubmodules = true;
};

6
pkgs/applications/gis/qmapshack/default.nix
View File

@ -18,13 +18,13 @@ mkDerivation rec {
cmakeFlags = [
"-DROUTINO_XML_PATH=${routino}/share/routino"
"-DQUAZIP_INCLUDE_DIR=${quazip}/include/quazip5"
"-DLIBQUAZIP_LIBRARY=${quazip}/lib/libquazip.so"
];
patches = [
"${src}/FindPROJ4.patch"
"${src}/FindQuaZip5.patch"
# Support QuaZip 1.x.
./pr350-support-quazip-1x.patch
];
qtWrapperArgs = [

141
pkgs/applications/gis/qmapshack/pr350-support-quazip-1x.patch Normal file
View File

@ -0,0 +1,141 @@
From 8fb751c656a14020ba37fb91b7f7cba3c49d8504 Mon Sep 17 00:00:00 2001
From: kiozen <oliver.eichler@gmx.de>
Date: Sat, 20 Mar 2021 12:14:29 +0100
Subject: [PATCH] [QMS-349] Upgrade to Quazip Qt5 V1.x
Simply adjusted the cmake scripts
---
CMakeLists.txt | 2 +-
src/qmapshack/CMakeLists.txt | 27 +++++++++++++--------------
3 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8d2cf127..7420d9b2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -152,7 +152,7 @@ find_package(GDAL REQUIRED)
find_package(PROJ REQUIRED)
find_package(JPEG REQUIRED)
find_package(ROUTINO REQUIRED)
-find_package(QuaZip5 REQUIRED)
+find_package(QuaZip-Qt5 REQUIRED)
find_package(ALGLIB ) # optional as we can use our local version
diff --git a/src/qmapshack/CMakeLists.txt b/src/qmapshack/CMakeLists.txt
index 08eeb183..9b3836d6 100644
--- a/src/qmapshack/CMakeLists.txt
+++ b/src/qmapshack/CMakeLists.txt
@@ -22,8 +22,8 @@ add_definitions(-DROUTINO_XML_PATH=${ROUTINO_XML_PATH})
# All source files needed to compile
###############################################################################################
-set( SRCS
- CAbout.cpp
+set( SRCS
+ CAbout.cpp
CMainWindow.cpp
CSingleInstanceProxy.cpp
canvas/CCanvas.cpp
@@ -160,7 +160,7 @@ set( SRCS
gis/trk/CInvalidTrk.cpp
gis/trk/CKnownExtension.cpp
gis/trk/CListTrkPts.cpp
- gis/trk/CPropertyTrk.cpp
+ gis/trk/CPropertyTrk.cpp
gis/trk/CScrOptTrk.cpp
gis/trk/CSelectActivityColor.cpp
gis/trk/CTableTrk.cpp
@@ -272,7 +272,7 @@ set( SRCS
mouse/line/CLineOpMovePoint.cpp
mouse/line/CLineOpSelectRange.cpp
mouse/line/CScrOptEditLine.cpp
- mouse/line/CScrOptRangeLine.cpp
+ mouse/line/CScrOptRangeLine.cpp
mouse/line/ILineOp.cpp
mouse/line/IMouseEditLine.cpp
plot/CPlot.cpp
@@ -401,7 +401,7 @@ set( HDRS
gis/CGisListDB.h
gis/CGisListWks.h
gis/CGisWorkspace.h
- gis/CSelDevices.h
+ gis/CSelDevices.h
gis/IGisItem.h
gis/IGisLine.h
gis/Poi.h
@@ -512,7 +512,7 @@ set( HDRS
gis/trk/CInvalidTrk.h
gis/trk/CKnownExtension.h
gis/trk/CListTrkPts.h
- gis/trk/CPropertyTrk.h
+ gis/trk/CPropertyTrk.h
gis/trk/CScrOptTrk.h
gis/trk/CSelectActivityColor.h
gis/trk/CTableTrk.h
@@ -579,7 +579,7 @@ set( HDRS
map/CMapList.h
map/CMapMAP.h
map/CMapPathSetup.h
- map/CMapPropSetup.h
+ map/CMapPropSetup.h
map/CMapRMAP.h
map/CMapTMS.h
map/CMapVRT.h
@@ -655,7 +655,7 @@ set( HDRS
realtime/CRtSelectSource.h
realtime/CRtWorkspace.h
realtime/IRtInfo.h
- realtime/IRtRecord.h
+ realtime/IRtRecord.h
realtime/IRtSource.h
realtime/gpstether/CRtGpsTether.h
realtime/gpstether/CRtGpsTetherInfo.h
@@ -764,7 +764,7 @@ set( UIS
gis/search/IGeoSearchWebConfigDialog.ui
gis/search/ISearchExplanationDialog.ui
gis/summary/IGisSummary.ui
- gis/summary/IGisSummarySetup.ui
+ gis/summary/IGisSummarySetup.ui
gis/trk/ICombineTrk.ui
gis/trk/ICutTrk.ui
gis/trk/IDetailsTrk.ui
@@ -818,7 +818,7 @@ set( UIS
mouse/range/IActionSelect.ui
mouse/range/IRangeToolSetup.ui
mouse/range/IScrOptRangeTool.ui
- mouse/range/IScrOptRangeTrk.ui
+ mouse/range/IScrOptRangeTrk.ui
mouse/IScrOptRuler.ui
mouse/IScrOptSelect.ui
mouse/line/IScrOptEditLine.ui
@@ -899,7 +899,6 @@ include_directories(
${PROJ_INCLUDE_DIRS}
${ROUTINO_INCLUDE_DIRS}
${ALGLIB_INCLUDE_DIRS}
- ${QUAZIP_INCLUDE_DIRS}
)
if(APPLE)
@@ -934,10 +933,10 @@ endif(Qt5DBus_FOUND)
target_link_libraries(${APPLICATION_NAME}
Qt5::Widgets
- Qt5::Xml
+ Qt5::Xml
Qt5::Sql
Qt5::PrintSupport
- Qt5::UiTools
+ Qt5::UiTools
Qt5::Network
Qt5::WebEngineWidgets
Qt5::Qml
@@ -947,7 +946,7 @@ target_link_libraries(${APPLICATION_NAME}
${PROJ_LIBRARIES}
${ROUTINO_LIBRARIES}
${ALGLIB_LIBRARIES}
- ${QUAZIP_LIBRARIES}
+ QuaZip::QuaZip
)
if(APPLE)

9
pkgs/applications/graphics/nomacs/default.nix
View File

@ -27,6 +27,15 @@ mkDerivation rec {
sha256 = "1bq7bv4p7w67172y893lvpk90d6fgdpnylynbj2kn8m2hs6khya4";
};
patches = [
# Add support for Quazip 1.x.
(fetchpatch {
url = "https://github.com/nomacs/nomacs/pull/576.patch";
sha256 = "11ryjvd9jbb0cqagai4a6980jfq8lrcbyw2d7z9yld1f42w9kbxm";
stripLen = 1;
})
];
setSourceRoot = ''
sourceRoot=$(echo */ImageLounge)
'';

3
pkgs/applications/graphics/openboard/default.nix
View File

@ -34,7 +34,8 @@ in mkDerivation rec {
postPatch = ''
substituteInPlace OpenBoard.pro \
--replace '/usr/include/quazip' '${quazip}/include/quazip5' \
--replace '/usr/include/quazip' '${quazip}/include/QuaZip-Qt5-${quazip.version}/quazip' \
--replace '-lquazip5' '-lquazip1-qt5' \
--replace '/usr/include/poppler' '${poppler.dev}/include/poppler'
'';

5
pkgs/applications/misc/ideamaker/default.nix
View File

@ -9,7 +9,7 @@
, libcork
, makeDesktopItem
, qt5
, quazip_qt4
, quazip
, zlib
}:
stdenv.mkDerivation rec {
@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
libcork
qt5.qtbase
qt5.qtserialport
quazip_qt4
quazip
zlib
];
@ -73,5 +73,6 @@ stdenv.mkDerivation rec {
license = licenses.unfree;
platforms = [ "x86_64-linux" ];
maintainers = with maintainers; [ lovesegfault ];
broken = true; # Segfaults on startup.
};
}

6
pkgs/applications/misc/xplr/default.nix
View File

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
name = "xplr";
version = "0.5.10";
version = "0.5.12";
src = fetchFromGitHub {
owner = "sayanarijit";
repo = name;
rev = "v${version}";
sha256 = "1gy0iv39arq2ri57iqsycp1sfnn1yafnhblr7p1my2wnmqwmd4qw";
sha256 = "0dmqa56sxyvrq03rpf9yczp75zk44s79ilz6kbykdghp0d9lyldf";
};
cargoSha256 = "01b4dlbakkdn3pfyyphabzrmqyp7fjy6n1nfk38z3zap5zvx8ipl";
cargoSha256 = "1mb1rfax91cbi2wvshl8jsfykx9kfwff8fkqa7rc4plqxnz0qxkx";
meta = with lib; {
description = "A hackable, minimal, fast TUI file explorer";

5
pkgs/applications/networking/flexget/default.nix
View File

@ -2,11 +2,11 @@
python3Packages.buildPythonApplication rec {
pname = "FlexGet";
version = "3.1.110";
version = "3.1.116";
src = python3Packages.fetchPypi {
inherit pname version;
sha256 = "e8642dcbbfe941e2d2def7bf2e28889082a78c1d041edb33dae180036832a96b";
sha256 = "6372b36495ae023bd64ce28ca649feba54b060ed8f0a5f606a4845974e834493";
};
postPatch = ''
@ -54,6 +54,7 @@ python3Packages.buildPythonApplication rec {
sqlalchemy
terminaltables
zxcvbn
psutil
# plugins
transmission-rpc
];

2
pkgs/applications/networking/instant-messengers/teamspeak/client.nix
View File

@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
''
mv ts3client_linux_${arch} ts3client
echo "patching ts3client..."
patchelf --replace-needed libquazip.so ${quazip}/lib/libquazip5.so ts3client
patchelf --replace-needed libquazip.so ${quazip}/lib/libquazip1-qt5.so ts3client
patchelf \
--interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-rpath ${lib.makeLibraryPath deps}:$(cat $NIX_CC/nix-support/orig-cc)/${libDir} \

4
pkgs/applications/science/biology/dcm2niix/default.nix
View File

@ -6,14 +6,14 @@
}:
stdenv.mkDerivation rec {
version = "1.0.20200331";
version = "1.0.20210317";
pname = "dcm2niix";
src = fetchFromGitHub {
owner = "rordenlab";
repo = "dcm2niix";
rev = "v${version}";
sha256 = "1cncfwhyhmg18n970lkn6yvp0i74ajznsl8dqz00asqfzmg681n1";
sha256 = "05rjk0xsrzcxa979vlx25k1rdz1in84gkfm9l1h9f7k4a4aa5r6j";
};
nativeBuildInputs = [ cmake git ];

4
pkgs/development/compilers/nim/default.nix
View File

@ -95,12 +95,12 @@ in {
nim-unwrapped = stdenv.mkDerivation rec {
pname = "nim-unwrapped";
version = "1.4.4";
version = "1.4.6";
strictDeps = true;
src = fetchurl {
url = "https://nim-lang.org/download/nim-${version}.tar.xz";
sha256 = "03k642nnjca0s6jlbn1v4jld51mbkix97jli4ky74gqlxyfp4wvd";
hash = "sha256-D7wPkoLP/oXembxHv6h2Ulud3aKi6uVcGFoIgEuY070=";
};
buildInputs = [ boehmgc openssl pcre readline sqlite ];

4
pkgs/development/libraries/ogre/default.nix
View File

@ -6,6 +6,7 @@
, libXxf86vm, libICE
, unzip
, libXrender
, SDL2
, withNvidiaCg ? false, nvidia_cg_toolkit
, withSamples ? false }:
@ -18,7 +19,7 @@ stdenv.mkDerivation rec {
sha256 = "1iv6k0dwdzg5nnzw2mcgcl663q4f7p2kj7nhs8afnsikrzxxgsi4";
};
cmakeFlags = [ "-DOGRE_BUILD_SAMPLES=${toString withSamples}" ]
cmakeFlags = [ "-DOGRE_BUILD_DEPENDENCIES=OFF" "-DOGRE_BUILD_SAMPLES=${toString withSamples}" ]
++ map (x: "-DOGRE_BUILD_PLUGIN_${x}=on")
([ "BSP" "OCTREE" "PCZ" "PFX" ] ++ lib.optional withNvidiaCg "CG")
++ map (x: "-DOGRE_BUILD_RENDERSYSTEM_${x}=on") [ "GL" ];
@ -32,6 +33,7 @@ stdenv.mkDerivation rec {
libX11 libXmu libSM
libXxf86vm libICE
libXrender
SDL2
] ++ lib.optional withNvidiaCg nvidia_cg_toolkit;
meta = {

4
pkgs/development/libraries/quazip/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "quazip";
version = "0.9.1";
version = "1.1";
src = fetchFromGitHub {
owner = "stachenov";
repo = pname;
rev = "v${version}";
sha256 = "11icgwv2xyxhd1hm1add51xv54zwkcqkg85d1xqlgiigvbm196iq";
sha256 = "06srglrj6jvy5ngmidlgx03i0d5w91yhi7sf846wql00v8rvhc5h";
};
buildInputs = [ zlib qtbase ];

5
pkgs/development/python-modules/flask-restx/default.nix
View File

@ -20,14 +20,14 @@
buildPythonPackage rec {
pname = "flask-restx";
version = "0.2.0";
version = "0.3.0";
# Tests not included in PyPI tarball
src = fetchFromGitHub {
owner = "python-restx";
repo = pname;
rev = version;
sha256 = "0xf2vkmdngp9cv9klznizai4byxjcf0iqh1pr4b83nann0jxqwy7";
sha256 = "0aj13nd3z71gb8c2kqiaz3f9k7jr0srlvrsx8hpz4nkpki8jiz2s";
};
propagatedBuildInputs = [ aniso8601 jsonschema flask werkzeug pytz six ]
@ -45,6 +45,7 @@ buildPythonPackage rec {
meta = with lib; {
homepage = "https://flask-restx.readthedocs.io/en/${version}/";
description = "Fully featured framework for fast, easy and documented API development with Flask";
changelog = "https://github.com/python-restx/flask-restx/raw/${version}/CHANGELOG.rst";
license = licenses.bsd3;
maintainers = [ maintainers.marsam ];
};

12
pkgs/development/tools/knightos/mkrom/default.nix
View File

@ -1,25 +1,27 @@
{ lib, stdenv, fetchFromGitHub, cmake, libxslt, asciidoc }:
{ lib, stdenv, fetchFromGitHub, libxslt, asciidoc }:
stdenv.mkDerivation rec {
pname = "mkrom";
version = "1.0.3";
version = "1.0.4";
src = fetchFromGitHub {
owner = "KnightOS";
repo = "mkrom";
rev = version;
sha256 = "0xgvanya40mdwy35j94j61hsp80dm5b440iphmr5ng3kjgchvpx2";
sha256 = "sha256-YFrh0tOGiM90uvU9ZWopW1+9buHDQtetuOtPDSYYaXw=";
};
strictDeps = true;
nativeBuildInputs = [ asciidoc cmake libxslt.bin ];
nativeBuildInputs = [ asciidoc libxslt.bin ];
hardeningDisable = [ "format" ];
installFlags = [ "DESTDIR=$(out)" ];
installTargets = [ "install" "install_man" ];
meta = with lib; {
homepage = "https://knightos.org/";
description = "Packages KnightOS distribution files into a ROM";
license = licenses.mit;
maintainers = with maintainers; [ siraben ];
platforms = platforms.all;
};
}

5
pkgs/development/tools/knightos/scas/default.nix
View File

@ -2,14 +2,13 @@
stdenv.mkDerivation rec {
pname = "scas";
version = "0.5.3";
version = "0.5.5";
src = fetchFromGitHub {
owner = "KnightOS";
repo = "scas";
rev = version;
sha256 = "0z6r07cl92kq860ddas5p88l990ih9cfqlzy5y4mk5hrmjzya60j";
sha256 = "sha256-JGQE+orVDKKJsTt8sIjPX+3yhpZkujISroQ6g19+MzU=";
};
cmakeFlags = [ "-DSCAS_LIBRARY=1" ];

52
pkgs/tools/graphics/quirc/default.nix
View File

@ -1,36 +1,40 @@
{lib, stdenv, fetchgit, SDL_gfx, SDL, libjpeg, libpng, pkg-config}:
let
s =
rec {
date = "2016-08-16";
version = "git-${date}";
baseName = "quirc";
name = "${baseName}-${version}";
url = "https://github.com/dlbeer/quirc";
rev = "5b262480091d5f84a67a4a56c728fc8b39844339";
sha256 = "1w5qvjafn14s6jjs7kiwsqirlsqbgv0p152hrsq463pm34hp0lzy";
};
in
{ lib, stdenv, fetchFromGitHub
, SDL_gfx, SDL, libjpeg, libpng, pkg-config
}:
stdenv.mkDerivation {
inherit (s) name version;
nativeBuildInputs = [ pkg-config ];
buildInputs = [
SDL SDL_gfx libjpeg libpng
];
src = fetchgit {
inherit (s) url sha256 rev;
pname = "quirc";
version = "2020-04-16";
src = fetchFromGitHub {
owner = "dlbeer";
repo = "quirc";
rev = "ed455904f35270888bc902b9e8c0c9b3184a8302";
sha256 = "1kqqvcnxcaxdgls9sibw5pqjz3g1gys2v64i4kfqp8wfcgd9771q";
};
NIX_CFLAGS_COMPILE="-I${SDL.dev}/include/SDL -I${SDL_gfx}/include/SDL";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ SDL SDL_gfx libjpeg libpng ];
makeFlags = [ "PREFIX=$(out)" ];
NIX_CFLAGS_COMPILE = "-I${SDL.dev}/include/SDL -I${SDL_gfx}/include/SDL";
configurePhase = ''
runHook preConfigure
# don't try to change ownership
sed -e 's/-[og] root//g' -i Makefile
runHook postConfigure
'';
preInstall = ''
mkdir -p "$out"/{bin,lib,include}
find . -maxdepth 1 -type f -perm -0100 -exec cp '{}' "$out"/bin ';'
# install all binaries
find -maxdepth 1 -type f -executable ! -name '*.so.*' | xargs cp -t "$out"/bin
'';
makeFlags = [ "PREFIX=$(out)" ];
meta = {
inherit (s) version;
description = "A small QR code decoding library";
license = lib.licenses.isc;
maintainers = [lib.maintainers.raskin];

12
pkgs/top-level/all-packages.nix
View File

@ -2826,6 +2826,8 @@ in
mididings = callPackage ../tools/audio/mididings { };
miniscript = callPackage ../applications/blockchains/miniscript { };
miniserve = callPackage ../tools/misc/miniserve {
inherit (darwin.apple_sdk.frameworks) Security;
};
@ -8229,16 +8231,10 @@ in
screen-message = callPackage ../tools/X11/screen-message { };
screencloud = callPackage ../applications/graphics/screencloud {
quazip = quazip_qt4;
};
screencloud = libsForQt5.callPackage ../applications/graphics/screencloud { };
screenkey = callPackage ../applications/video/screenkey { };
quazip_qt4 = libsForQt5.quazip.override {
qtbase = qt4;
};
scfbuild = python3.pkgs.callPackage ../tools/misc/scfbuild { };
scriptaculous = callPackage ../development/libraries/scriptaculous { };
@ -23918,7 +23914,7 @@ in
id3v2 = callPackage ../applications/audio/id3v2 { };
ideamaker = callPackage ../applications/misc/ideamaker { };
ideamaker = libsForQt5.callPackage ../applications/misc/ideamaker { };
ifenslave = callPackage ../os-specific/linux/ifenslave { };