pogmommy/zellij
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(nix): fix makeDesktopItem (#1215)

Browse source
This commit is contained in:
a-kenji 2022-03-13 13:43:29 +01:00 • committed by GitHub
parent 2c08c425c7
commit 54b0859e40
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 57 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
default.nix
View file

@ -1,14 +1,14 @@
(import (import
( (
let let
lock = builtins.fromJSON (builtins.readFile ./flake.lock); lock = builtins.fromJSON (builtins.readFile ./flake.lock);
in in
fetchTarball { fetchTarball {
url = "https://github.com/edolstra/flake-compat/archive/${lock.nodes.flake-compat.locked.rev}.tar.gz"; url = "https://github.com/edolstra/flake-compat/archive/${lock.nodes.flake-compat.locked.rev}.tar.gz";
sha256 = lock.nodes.flake-compat.locked.narHash; sha256 = lock.nodes.flake-compat.locked.narHash;
} }
) )
{ {
src = ./.; src = ./.;
}) })
.defaultNix .defaultNix

35
nix/crate2nix.nix
View file

@ -13,23 +13,24 @@
generatedCargoNix generatedCargoNix
; ;
project = import project =
(generatedCargoNix { import
inherit name src; (generatedCargoNix {
}) inherit name src;
{ })
inherit pkgs; {
buildRustCrateForPkgs = pkgs: inherit pkgs;
pkgs.buildRustCrate.override { buildRustCrateForPkgs = pkgs:
defaultCrateOverrides = pkgs.buildRustCrate.override {
pkgs.defaultCrateOverrides defaultCrateOverrides =
// { pkgs.defaultCrateOverrides
# Crate dependency overrides go here // {
zellij = attrs: { # Crate dependency overrides go here
inherit postInstall desktopItems meta name nativeBuildInputs; zellij = attrs: {
inherit postInstall desktopItems meta name nativeBuildInputs;
};
}; };
}; };
}; };
};
in in
project.workspaceMembers.zellij.build project.workspaceMembers.zellij.build

31
nix/default.nix
View file

@ -38,10 +38,10 @@ flake-utils.lib.eachSystem [
rustToolchainToml = pkgs.rust-bin.fromRustupToolchainFile ../rust-toolchain; rustToolchainToml = pkgs.rust-bin.fromRustupToolchainFile ../rust-toolchain;
cargoLock = { cargoLock = {
lockFile = (builtins.path { lockFile = builtins.path {
path = ../Cargo.lock; path = ../Cargo.lock;
name = "Cargo.lock"; name = "Cargo.lock";
}); };
}; };
cargo = rustToolchainToml; cargo = rustToolchainToml;
rustc = rustToolchainToml; rustc = rustToolchainToml;
@ -107,7 +107,7 @@ flake-utils.lib.eachSystem [
comment = "Manage your terminal applications"; comment = "Manage your terminal applications";
exec = "zellij"; exec = "zellij";
icon = "zellij"; icon = "zellij";
categories = ["ConsoleOnly;System"]; categories = ["ConsoleOnly"];
}) })
]; ];
meta = with pkgs.lib; { meta = with pkgs.lib; {
@ -130,19 +130,18 @@ in rec {
}; };
# native nixpkgs support - keep supported # native nixpkgs support - keep supported
packages.zellij-native = packages.zellij-native = (pkgs.makeRustPlatform {inherit cargo rustc;}).buildRustPackage {
(pkgs.makeRustPlatform {inherit cargo rustc;}).buildRustPackage { inherit
inherit src
src name
name cargoLock
cargoLock buildInputs
buildInputs nativeBuildInputs
nativeBuildInputs postInstall
postInstall desktopItems
desktopItems meta
meta ;
; };
};
defaultPackage = packages.zellij; defaultPackage = packages.zellij;

24
shell.nix
View file

@ -1,14 +1,14 @@
(import (import
( (
let let
lock = builtins.fromJSON (builtins.readFile ./flake.lock); lock = builtins.fromJSON (builtins.readFile ./flake.lock);
in in
fetchTarball { fetchTarball {
url = "https://github.com/edolstra/flake-compat/archive/${lock.nodes.flake-compat.locked.rev}.tar.gz"; url = "https://github.com/edolstra/flake-compat/archive/${lock.nodes.flake-compat.locked.rev}.tar.gz";
sha256 = lock.nodes.flake-compat.locked.narHash; sha256 = lock.nodes.flake-compat.locked.narHash;
} }
) )
{ {
src = ./.; src = ./.;
}) })
.shellNix .shellNix