commit e858585abbf5a1830618ef336d3b75fdfc8c69be
parent 446f3cd281681e4dc9f0c6e1257b31d547af1403
Author: Nikolay Korotkiy <sikmir@disroot.org>
Date: Sun, 28 Jan 2024 22:01:58 +0400
Fixup
Diffstat:
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/pkgs/default.nix b/pkgs/default.nix
@@ -286,7 +286,7 @@ lib.makeScope newScope (
gpxeditor = callPackage ./gpx/gpxeditor { };
gpxlib = callPackage ./gpx/gpxlib { };
gpxtools = callPackage ./gpx/gpxtools { };
- gpxtrackposter = callPackage ./gpx/gpxtrackposter { };
+ #gpxtrackposter = callPackage ./gpx/gpxtrackposter { };
routeconverter = callPackage ./gpx/routeconverter { };
trackanimation = callPackage ./gpx/trackanimation { };
@@ -381,9 +381,9 @@ lib.makeScope newScope (
nmtree = callPackage ./misc/nmtree { };
objlab = callPackage ./misc/objlab { };
ocelotgui = libsForQt5.callPackage ./misc/ocelotgui { };
- opcua-stack = callPackage ./misc/opcua-stack {
- openssl = pkgs.openssl_1_1;
- };
+ #opcua-stack = callPackage ./misc/opcua-stack {
+ # openssl = pkgs.openssl_1_1;
+ #};
playonmac = callPackage ./misc/playonmac { };
plotjuggler = libsForQt5.callPackage ./misc/plotjuggler { };
pnoise = callPackage ./misc/pnoise { };
diff --git a/pkgs/gnss/gnsstk-apps/default.nix b/pkgs/gnss/gnsstk-apps/default.nix
@@ -17,6 +17,7 @@ stdenv.mkDerivation (finalAttrs: {
cmakeFlags = [
(lib.cmakeBool "BUILD_EXT" true)
+ (lib.cmakeFeature "CMAKE_CXX_STANDARD" "14")
];
meta = with lib; {
diff --git a/pkgs/gnss/gnsstk/default.nix b/pkgs/gnss/gnsstk/default.nix
@@ -23,6 +23,7 @@ stdenv.mkDerivation (finalAttrs: {
cmakeFlags = [
(lib.cmakeBool "BUILD_EXT" true)
+ (lib.cmakeFeature "CMAKE_CXX_STANDARD" "14")
];
meta = with lib; {