diff --git a/default.nix b/default.nix index 617ce258..19a6f730 100644 --- a/default.nix +++ b/default.nix @@ -7,7 +7,7 @@ pimalaya.mkDefault ( { src = ./.; - version = "1.1.0"; + version = "1.2.0"; mkPackage = ( { lib, @@ -33,7 +33,8 @@ pimalaya.mkDefault ( exe = stdenv.hostPlatform.extensions.executable; in lib.optionalString (lib.hasInfix "wine" emulator) '' - export WINEPREFIX=`mktemp -d` + export WINEPREFIX="''${WINEPREFIX:-$(mktemp -d)}" + mkdir -p $WINEPREFIX '' + '' mkdir -p $out/share/{applications,completions,man} diff --git a/flake.lock b/flake.lock index 8416a6fc..edd00137 100644 --- a/flake.lock +++ b/flake.lock @@ -41,11 +41,11 @@ "pimalaya": { "flake": false, "locked": { - "lastModified": 1768260022, - "narHash": "sha256-GS6EOWJ7iRIzNB4pD1lBim2TRAoT8IT2l+tWLLeNhWM=", + "lastModified": 1770914484, + "narHash": "sha256-kPxdpg98/EVQKLkUdiFEYWWWI1uTLWfIewyCmb4ZfpE=", "owner": "pimalaya", "repo": "nix", - "rev": "5317be3d745a3b9687301c94ee5ab68dbc5a1253", + "rev": "23454cd59e2a32199a67f36f3b13cd5145b5ffb3", "type": "github" }, "original": { diff --git a/shell.nix b/shell.nix index 46e742df..6e9a40bc 100644 --- a/shell.nix +++ b/shell.nix @@ -1,8 +1,16 @@ { + nixpkgs ? , + system ? builtins.currentSystem, + pkgs ? import nixpkgs { inherit system; }, pimalaya ? import (fetchTarball "https://github.com/pimalaya/nix/archive/master.tar.gz"), - ... + fenix ? import (fetchTarball "https://github.com/nix-community/fenix/archive/monthly.tar.gz") { }, }: pimalaya.mkShell { - extraBuildInputs = "nixd,nixfmt-rfc-style,git-cliff,cargo-deny"; + inherit + nixpkgs + system + pkgs + fenix + ; }