public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'staging-next' into staging

Browse Source 
In python-packages.nix, resolve conflict between 50d604314e and 187d0371ab.
This commit is contained in:
Jan Tojnar
2021-04-08 17:14:31 +02:00
parent 97490e6783 bf6abedefb
commit 625ce6c7f6
112 changed files with 2577 additions and 1772 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/misc/qcad/default.nix
+20 -5
View File
@@ -10,18 +10,20 @@
, qtsvg
, qtxmlpatterns
, qttools
, lib, stdenv
, lib
, stdenv
, installShellFiles
}:
mkDerivationWith stdenv.mkDerivation rec {
pname = "qcad";
version = "3.26.0.1";
version = "3.26.1.0";
src = fetchFromGitHub {
owner = "qcad";
repo = "qcad";
rev = "v${version}";
sha256 = "sha256-V+QlwM8BWmcarwZtqJfc+MYHOZgIH1W5R8m2EHhNJls=";
sha256 = "sha256-OWAc7g8DiJR3z6dUF5D0Yo3wnRKd1Xe7D1eq15NRW5c=";
};
patches = [
@@ -36,7 +38,7 @@ mkDerivationWith stdenv.mkDerivation rec {
src/3rdparty/qt-labs-qtscriptgenerator-5.14.0/qt-labs-qtscriptgenerator-5.14.0.pro \
src/3rdparty/qt-labs-qtscriptgenerator-${qtbase.version}/qt-labs-qtscriptgenerator-${qtbase.version}.pro
fi
'';
'';
qmakeFlags = [
"MUPARSER_DIR=${muparser}"
@@ -65,15 +67,27 @@ mkDerivationWith stdenv.mkDerivation rec {
cp -r scripts $out/lib
cp -r plugins $out/lib/plugins
cp -r patterns $out/lib/patterns
cp -r fonts $out/lib/fonts
cp -r libraries $out/lib/libraries
cp -r linetypes $out/lib/linetypes
cp -r ts $out/lib/ts
# workaround to fix the library browser:
rm -r $out/lib/plugins/sqldrivers
ln -s -t $out/lib/plugins ${qtbase}/${qtbase.qtPluginPrefix}/sqldrivers
rm -r $out/lib/plugins/printsupport
ln -s -t $out/lib/plugins ${qtbase}/${qtbase.qtPluginPrefix}/printsupport
rm -r $out/lib/plugins/imageformats
ln -s -t $out/lib/plugins ${qtbase}/${qtbase.qtPluginPrefix}/imageformats
install -Dm644 scripts/qcad_icon.svg $out/share/icons/hicolor/scalable/apps/qcad.svg
installManPage qcad.1
runHook postInstall
'';
'';
buildInputs = [
boost
@@ -89,6 +103,7 @@ mkDerivationWith stdenv.mkDerivation rec {
pkg-config
qmake
qttools
installShellFiles
];
meta = with lib; {
pkgs/applications/misc/viking/default.nix
+32 -35
View File
@@ -1,60 +1,57 @@
{ fetchurl, fetchpatch, lib, stdenv, makeWrapper
, pkg-config, intltool, gettext, gtk2, expat, curl
, gpsd, bc, file, gnome-doc-utils, libexif, libxml2, libxslt, scrollkeeper
, docbook_xml_dtd_412, gexiv2, gpsbabel, expect
{ lib, stdenv, fetchurl
, docbook_xml_dtd_45, docbook_xsl, intltool, itstool, libxslt, pkg-config, wrapGAppsHook, yelp-tools
, curl, gdk-pixbuf, gtk3, json-glib, libxml2
, gpsbabel
, withGeoClue ? true, geoclue2
, withGeoTag ? true, gexiv2
, withMagic ? true, file
, withMapnik ? false, mapnik
, withMBTiles ? true, sqlite
, withOAuth ? true, liboauth
, withMd5Hash ? true, nettle
, withGeoClue ? true, geoclue2 }:
, withOAuth ? true, liboauth
, withRealtimeGPSTracking ? true, gpsd
}:
stdenv.mkDerivation rec {
pname = "viking";
version = "1.8";
version = "1.9";
src = fetchurl {
url = "mirror://sourceforge/viking/viking/viking-${version}.tar.bz2";
sha256 = "1a0g0fbj4q5s9p8fv0mqvxws10q3naj81l72sz30vvqpbz6vqp45";
url = "mirror://sourceforge/viking/viking-${version}.tar.bz2";
sha256 = "0fybpy6k0vmjp231h5ckysl3c0rcnh2afznijwq6y78j4hywyjpy";
};
patches = [
# Fix build without mapnik and sqlite https://github.com/viking-gps/viking/pull/79
(fetchpatch {
url = "https://github.com/viking-gps/viking/commit/995feefcb97bdb1590ed018224cf47ce197fe0c1.patch";
sha256 = "1xb0b76kg690fag9mw3yfj5k766jmqp1sm8q4f29n1h3nz5g8izd";
})
];
nativeBuildInputs = [ docbook_xml_dtd_45 docbook_xsl intltool itstool libxslt pkg-config wrapGAppsHook yelp-tools ];
nativeBuildInputs = [ pkg-config makeWrapper ];
buildInputs = [ intltool gettext gtk2 expat curl gpsd bc file gnome-doc-utils
libexif libxml2 libxslt scrollkeeper docbook_xml_dtd_412 gexiv2
] ++ lib.optional withMapnik mapnik
buildInputs = [ curl gdk-pixbuf gtk3 json-glib libxml2 ]
++ lib.optional withGeoClue geoclue2
++ lib.optional withGeoTag gexiv2
++ lib.optional withMagic file
++ lib.optional withMapnik mapnik
++ lib.optional withMBTiles sqlite
++ lib.optional withMd5Hash nettle
++ lib.optional withOAuth liboauth
++ lib.optional withMBTiles sqlite;
++ lib.optional withOAuth liboauth
++ lib.optional withRealtimeGPSTracking gpsd;
configureFlags = [
"--disable-scrollkeeper"
(lib.enableFeature withMapnik "mapnik")
(lib.enableFeature withGeoClue "geoclue")
(lib.enableFeature withMd5Hash "nettle")
(lib.enableFeature withOAuth "oauth")
(lib.enableFeature withGeoTag "geotag")
(lib.enableFeature withMagic "magic")
(lib.enableFeature withMapnik "mapnik")
(lib.enableFeature withMBTiles "mbtiles")
(lib.enableFeature withMd5Hash "nettle")
(lib.enableFeature withOAuth "oauth")
(lib.enableFeature withRealtimeGPSTracking "realtime-gps-tracking")
];
preBuild = ''
sed -i help/Makefile \
-e 's|--noout|--noout --nonet --path "${scrollkeeper}/share/xml/scrollkeeper/dtds"|g'
sed -i help/Makefile -e 's|--postvalid||g'
'';
hardeningDisable = [ "format" ];
doCheck = true;
postInstall = ''
wrapProgram $out/bin/viking \
--prefix PATH : "${gpsbabel}/bin" \
--prefix PATH : "${expect}/bin"
preFixup = ''
gappsWrapperArgs+=(
--prefix PATH : ${lib.makeBinPath [ gpsbabel ]}
)
'';
meta = with lib; {