From 6a67d186835d8098572238c35b77477ba152ad4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20DOUIN?= Date: Wed, 27 Nov 2024 10:48:13 +0100 Subject: [PATCH] fix wrong nixpkgs + wineboot arg --- default.nix | 2 +- flake.lock | 11 +++++------ flake.nix | 7 +++++-- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/default.nix b/default.nix index 44b84c47..5e82a8f8 100644 --- a/default.nix +++ b/default.nix @@ -57,7 +57,7 @@ himalaya.overrideAttrs (drv: { # NOTE: manual wineprefix update is somehow needed: # postInstall = (drv.postInstall or "") + lib.optionalString hostPlatform.isWindows '' - ${lib.getExe' wine "wineboot"} -u + ${lib.getExe' wine "wineboot"} --init '' + '' mkdir -p $out/bin/share/{applications,completions,man,services} cp assets/himalaya.desktop $out/bin/share/applications/ diff --git a/flake.lock b/flake.lock index 9e74d4ca..170e56b2 100644 --- a/flake.lock +++ b/flake.lock @@ -23,16 +23,15 @@ }, "nixpkgs": { "locked": { - "lastModified": 1732014248, - "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=", - "owner": "nixos", + "lastModified": 1732539489, + "narHash": "sha256-EPstM4aUuClDkFdoyno1CSRZIfGdCfZKw/XzMlQB0NY=", + "owner": "soywod", "repo": "nixpkgs", - "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367", + "rev": "87b010196489f96e4acdcc804ed3d096476e46ad", "type": "github" }, "original": { - "owner": "nixos", - "ref": "nixos-unstable", + "owner": "soywod", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index c0675952..01262db9 100644 --- a/flake.nix +++ b/flake.nix @@ -2,9 +2,12 @@ description = "CLI to manage emails"; inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + # TODO: nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + # + nixpkgs.url = "github:soywod/nixpkgs"; fenix = { - # https://github.com/nix-community/fenix/pull/145 + # TODO: url = "github:nix-community/fenix"; + # url = "github:soywod/fenix"; inputs.nixpkgs.follows = "nixpkgs"; };