From 0f2c2d0c558e8e7b796fce73037ddec953962b97 Mon Sep 17 00:00:00 2001 From: Volker Schukai <volker.schukai@schukai.com> Date: Sun, 30 Jul 2023 00:03:02 +0200 Subject: [PATCH] fix: build process --- devenv.lock | 8 ++++---- devenv.nix | 6 +++--- flake.nix | 1 - 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/devenv.lock b/devenv.lock index bb49294..710747d 100644 --- a/devenv.lock +++ b/devenv.lock @@ -171,11 +171,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1690656747, - "narHash": "sha256-h49g8saWlR4lSqZtt9PWHzlpc7bJMnDSZzoPhh+zfOQ=", + "lastModified": 1690668065, + "narHash": "sha256-7ac/7Lqh7CBAnwFv2YG2hnI9eTUR/9IWgfB0Xrnb/zU=", "ref": "refs/heads/master", - "rev": "672d9effe471c442fb8a12ce6328ea3ee59b736c", - "revCount": 32, + "rev": "7424eafaa1ac95d6b237de0449926655d2bed94b", + "revCount": 35, "type": "git", "url": "https://gitlab.schukai.com/oss/utilities/version.git" }, diff --git a/devenv.nix b/devenv.nix index 2215c79..41fa742 100644 --- a/devenv.nix +++ b/devenv.nix @@ -2,7 +2,7 @@ { pkgs, inputs, phps, lib, config, modulesPath,... }: { - env.LD_LIBRARY_PATH = lib.makeLibraryPath [ ]; + env.APP_NAME = "version"; # https://devenv.sh/packages/ @@ -43,14 +43,14 @@ go = { enable = true; }; }; - difftastic.enable = true; + difftastic.enable = true; # This script is executed when the app is built # You can use it to build the app scripts.build-app.exec = '' #!${pkgs.bash}/bin/bash -#set -euo pipefail + set -x PATH="''${PATH}":${pkgs.coreutils}/bin diff --git a/flake.nix b/flake.nix index b3ff62e..bfce221 100644 --- a/flake.nix +++ b/flake.nix @@ -24,7 +24,6 @@ in { - # Provide some binary packages for selected system types. packages = forAllSystems (system: let pkgs = nixpkgsFor.${system}; -- GitLab