made the flake nicer and updated nixpkgs and make version follows what (

#249)

users are actually using

an update after ages

I guess a change at a time is better

making version configurable

hmmmm maybe

maybe the right way to expose version

nice AAAAAAAAAAAAAA

wow debugging

lets go I guess

used the right rev just before a broken nixpkgs

added bwrap

yippie ?? probably

hmmmmmmm trying to break it

cleaning things up

lets do this

Co-authored-by: beh-10257 <beh-10257@users.noreply.github.com>

README.md

@@ -153,7 +153,7 @@ and in your `configuration.nix`
 ```nix
 {inputs, pkgs, ... }:
 {
-  environment.systemPackages = [  inputs.umu.packages.${pkgs.system}.umu  ];
+  environment.systemPackages = [  (inputs.umu.packages.${pkgs.system}.umu.override {version = "${inputs.umu.shortRev}";})  ];
 }
 ```
 

packaging/nix/combine.nix

@@ -1,9 +1,9 @@
-{ env, package, symlinkJoin }:
+{ env, package, symlinkJoin,version }:
 symlinkJoin {
   name = "umu-run-bwrap";
   paths = [
-    env
-    package
+    (package.override {version = "${version}";})
+    (env.override {version = "${version}";})
   ];
   postBuild = ''
     rm $out/bin/umu

packaging/nix/flake.nix

@@ -1,7 +1,12 @@
 {
   description = "umu universal game launcher";
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
+    nixpkgs = {
+      type = "github";
+      owner = "NixOS";
+      repo = "nixpkgs";
+      ref = "nixpkgs-unstable";
+    };
   };
   outputs = { self, nixpkgs }:
   let
@@ -10,11 +15,12 @@
   in
   let
   pyth = nixpk.pkgs.python3;
+  version = "1.1.3";
   in
   let
-    umu-package = nixpk.callPackage ./umu-launcher.nix { umu-launcher=umu-launcher-src; pyth1=pyth; };
-    umu-run = nixpk.callPackage ./umu-run.nix { package=umu-package; };
+    umu-launcher = nixpk.callPackage ./umu-launcher.nix { umu-launcher=umu-launcher-src; pyth1=pyth; version = "${version}"; };
+    umu-run = nixpk.callPackage ./umu-run.nix { package=umu-launcher; version = "${version}"; };
   in{
-    packages.x86_64-linux.umu = nixpk.callPackage ./combine.nix { env=umu-run; package=umu-package; };
+    packages.x86_64-linux.umu = nixpk.callPackage ./combine.nix { env=umu-run; package=umu-launcher; version = "${version}"; };
   };
 }

packaging/nix/umu-launcher.nix

@@ -1,7 +1,7 @@
-{pyth1 ,python3Packages , umu-launcher, pkgs, ...}:
+{pyth1 ,python3Packages , umu-launcher, pkgs,version, ...}:
 python3Packages.buildPythonPackage {
-  name = "umu-launcher";
-  version = "1.1.3";
+  pname = "umu-launcher";
+  version = "${version}";
   src = umu-launcher;
   pyproject = false;
   depsBuildBuild = [
@@ -22,6 +22,7 @@ python3Packages.buildPythonPackage {
   ];
   propagatedBuildInputs = [
     pyth1
+    pkgs.bubblewrap
     pkgs.python3Packages.xlib
     pkgs.python3Packages.filelock
   ];

packaging/nix/umu-run.nix

@@ -1,6 +1,10 @@
-{ package, buildFHSEnv, writeShellScript, ...}:
-buildFHSEnv {
+{ package, buildFHSEnv, writeShellScript,version, ...}:
+buildFHSEnv{
   name = "umu-run";
+  version = "${version}";
+  targetPkgs = pkgs: ([
+    package
+  ]);
   runScript = writeShellScript "umu-run-shell" ''
     ${package}/bin/umu "$@"
   '';