lets go I guess

beh-10257 · Oct 17, 2024 · 8f7f087 · 8f7f087
1 parent 05556c7
commit 8f7f087
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/packaging/nix/combine.nix b/packaging/nix/combine.nix
@@ -2,8 +2,8 @@
 symlinkJoin {
   name = "umu-run-bwrap";
   paths = [
-    env
     (package.override {version = "${version}";})
+    (env.override {version = "${version}";})
   ];
   postBuild = ''
     rm $out/bin/umu

diff --git a/packaging/nix/flake.nix b/packaging/nix/flake.nix
@@ -14,7 +14,7 @@
   in
   let
     umu-package = nixpk.callPackage ./umu-launcher.nix { umu-launcher=umu-launcher-src; pyth1=pyth; version = "${version}"; };
-    umu-run = nixpk.callPackage ./umu-run.nix { package=umu-package; };
+    umu-run = nixpk.callPackage ./umu-run.nix { package=umu-package; version = "${version}"; };
   in{
     packages.x86_64-linux.umu = nixpk.callPackage ./combine.nix { env=umu-run; package=umu-package; version = "${version}"; };
   };

diff --git a/packaging/nix/umu-launcher.nix b/packaging/nix/umu-launcher.nix
@@ -1,7 +1,7 @@
 {pyth1 ,python3Packages , umu-launcher, pkgs,version, ...}:
 python3Packages.buildPythonPackage {
   version = "${version}";
-  pname = "umu-launcher-${version}";
+  pname = "umu-launcher";
   #version = "1.1.3-${umu-launcher.shortRev}";
   src = umu-launcher;
   pyproject = false;

diff --git a/packaging/nix/umu-run.nix b/packaging/nix/umu-run.nix
@@ -1,6 +1,7 @@
-{ package, buildFHSEnv, writeShellScript, ...}:
+{ package, buildFHSEnv, writeShellScript,version, ...}:
 buildFHSEnv {
-  pname = "umu-run";
+  name = "umu-run";
+  version = "${version}";
   runScript = writeShellScript "umu-run-shell" ''
     ${package}/bin/umu "$@"
   '';