Merge pull request #643 from PJungkamp/packaging-nix

packaging-nix: fix broken `git+file:.` input
VILLASframework · May 25, 2023 · 7506e2c · 7506e2c
2 parents e47775e + 58dbd91
commit 7506e2c
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 24 deletions.
diff --git a/packaging/nix/README.md b/packaging/nix/README.md
@@ -283,7 +283,7 @@ Here is a more complete `flake.nix` containing `devShells` available to
         jq
         bat
       ];
-    }
+    };
   };
 }
 ```

diff --git a/packaging/nix/flake.lock b/packaging/nix/flake.lock
diff --git a/packaging/nix/flake.nix b/packaging/nix/flake.nix
@@ -4,8 +4,8 @@
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs";
 
-    src = {
-      url = "git+file:.?submodules=1";
+    common = {
+      url = "github:VILLASframework/common?submodules=1";
       flake = false;
     };
 
@@ -43,7 +43,8 @@
         default = villas;
 
         villas-minimal = pkgs.callPackage ./villas.nix {
-          inherit (inputs) src;
+          src = ../..;
+          common = inputs.common;
         };
 
         villas = villas-minimal.override {

diff --git a/packaging/nix/villas.nix b/packaging/nix/villas.nix
@@ -1,6 +1,7 @@
 {
   # build dependencies
   cmake,
+  common,
   lib,
   makeWrapper,
   pkg-config,
@@ -61,6 +62,9 @@ stdenv.mkDerivation {
     # 'array-bounds' and 'stringop-overflow' for villas-relay
     "-DCMAKE_CXX_FLAGS_RELEASE=-Wno-error"
   ];
+  preConfigure = ''
+    rm -d common && ln -sf ${common} common
+  '';
   postInstall = ''
     wrapProgram $out/bin/villas \
       --set PATH ${lib.makeBinPath [(placeholder "out") gnugrep]}
-Original file line number
+Diff line change
@@ Expand Up @@
             jq
             bat
           ];
-        }
+        };
       };
     }
     ```
@@ Expand Down @@