update and fix

Signed-off-by: Kristoffer Dalby <[email protected]>

Package.resolved

@@ -41,8 +41,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/apple/swift-argument-parser.git",
       "state" : {
-        "revision" : "c8ed701b513cf5177118a175d85fbbbcd707ab41",
-        "version" : "1.3.0"
+        "revision" : "0fbc8848e389af3bb55c182bc19ca9d5dc2f255b",
+        "version" : "1.4.0"
       }
     },
     {
@@ -59,8 +59,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/apple/swift-system.git",
       "state" : {
-        "revision" : "025bcb1165deab2e20d4eaba79967ce73013f496",
-        "version" : "1.2.1"
+        "revision" : "f9266c85189c2751589a50ea5aec72799797e471",
+        "version" : "1.3.0"
       }
     },
     {

Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version:5.6
+// swift-tools-version:5.8
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 // https://theswiftdev.com/the-swift-package-manifest-file/
@@ -38,13 +38,13 @@ let package = Package(
     .package(url: "https://github.com/t089/swift-vips.git", branch: "main"),
     .package(url: "https://github.com/kradalby/SwiftExif.git", from: "0.0.7"),
     // .package(path: "../SwiftExif"),
-    .package(url: "https://github.com/apple/swift-log.git", from: "1.5.2"),
+    .package(url: "https://github.com/apple/swift-log.git", from: "1.5.4"),
     .package(url: "https://github.com/Kitura/Configuration.git", from: "3.1.0"),
     .package(url: "https://github.com/onevcat/Rainbow.git", from: "4.0.1"),
     .package(
       url: "https://github.com/apple/swift-tools-support-core.git",
-      .upToNextMajor(from: "0.5.2")),
-    .package(url: "https://github.com/apple/swift-argument-parser.git", from: "1.2.2"),
+      .upToNextMajor(from: "0.6.1")),
+    .package(url: "https://github.com/apple/swift-argument-parser.git", from: "1.4.0"),
   ],
   targets: [
     .executableTarget(

flake.nix

@@ -63,6 +63,9 @@
           xorg.libXdmcp.dev
           libhwy
 
+          # Added 2024-06-04
+          openssl.dev
+
           # If the compilation of swift-vips is failing with something like:
           # fatal error: 'glib.h' file not found
           # look for a warning before the error like:
@@ -71,6 +74,7 @@
         ]
         ++ lib.optionals pkgs.stdenv.isLinux [
           swift-corelibs-libdispatch
+          glibc.dev
 
           # swift-vips linux deps
           libselinux.dev
@@ -95,11 +99,12 @@
             ]))
           ./.;
         in
-          pkgs.stdenv.mkDerivation rec {
+          pkgs.swift.stdenv.mkDerivation rec {
             pname = "munin";
             version = "0.0.0";
 
             inherit src;
+            LD_LIBRARY_PATH = "${pkgs.swiftPackages.Dispatch}/lib";
 
             strictDeps = true;
 
@@ -113,6 +118,7 @@
             # in the correct place, where SwiftPM expects them.
             configurePhase = generated.configure;
 
+
             # swiftpmFlags = ["--target x86_64-pc-linux-gnu"];
 
             installPhase = ''
@@ -134,7 +140,8 @@
       };
     in rec {
       # `nix develop`
-      devShell = pkgs.mkShell {
+      devShell = pkgs.mkShell.override { stdenv = pkgs.swift.stdenv; } {
+        LD_LIBRARY_PATH = "${pkgs.swiftPackages.Dispatch}/lib";
         nativeBuildInputs = ndeps pkgs;
         buildInputs =
           (bdeps pkgs)