gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2025-01-03 06:52:08 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix: update flake config to run again (#4641)

Browse Source
This commit is contained in:
Nico Domino 2024-08-07 17:54:57 +02:00 committed by GitHub
parent 9a0e484171
commit b741b9fbe4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 18 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
flake.lock
View File

@ -18,34 +18,17 @@
"type": "github"
}
},
"nixpkgs": {
"locked": {
"lastModified": 1721686456,
"narHash": "sha256-nw/BnNzATDPfzpJVTnY8mcSKKsz6BJMEFRkJ332QSN0=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "575f3027caa1e291d24f1e9fb0e3a19c2f26d96b",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-24.05",
"repo": "nixpkgs",
"type": "github"
}
},
"root": {
"inputs": {
"flake-utils": "flake-utils",
"nixpkgs": "nixpkgs",
"rust-overlay": "rust-overlay",
"unstable": "unstable"
"unstablePkgs": "unstablePkgs"
}
},
"rust-overlay": {
"inputs": {
"nixpkgs": [
"nixpkgs"
"unstablePkgs"
]
},
"locked": {
@ -77,13 +60,13 @@
"type": "github"
}
},
"unstable": {
"unstablePkgs": {
"locked": {
"lastModified": 1721562059,
"narHash": "sha256-Tybxt65eyOARf285hMHIJ2uul8SULjFZbT9ZaEeUnP8=",
"lastModified": 1722813957,
"narHash": "sha256-IAoYyYnED7P8zrBFMnmp7ydaJfwTnwcnqxUElC1I26Y=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "68c9ed8bbed9dfce253cc91560bf9043297ef2fe",
"rev": "cb9a96f23c491c081b38eab96d22fa958043c9fa",
"type": "github"
},
"original": {

29
flake.nix
View File

@ -1,30 +1,26 @@
{
inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05";
unstable.url = "github:nixos/nixpkgs/nixos-unstable";
unstablePkgs.url = "github:nixos/nixpkgs/nixos-unstable";
flake-utils.url = "github:numtide/flake-utils";
rust-overlay = {
url = "github:oxalica/rust-overlay";
inputs = {
nixpkgs.follows = "nixpkgs";
nixpkgs.follows = "unstablePkgs";
};
};
};
outputs = { self, nixpkgs, unstable, flake-utils, rust-overlay }:
outputs = { self, unstablePkgs, flake-utils, rust-overlay }:
flake-utils.lib.eachDefaultSystem
(system:
let
overlays = [ (import rust-overlay) ];
# pkgs = import nixpkgs {
# inherit system overlays;
# };
unstablePkgs = import unstable {
unstable = import unstablePkgs {
inherit system overlays;
};
rustToolchain = unstablePkgs.pkgsBuildHost.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml.stable;
rustToolchain = unstable.pkgsBuildHost.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml;
common = with unstablePkgs; [
common = with unstable; [
gtk3
glib
glib-networking
@ -41,7 +37,7 @@
];
# runtime Deps
libraries = with unstablePkgs;[
libraries = with unstable;[
cairo
pango
harfbuzz
@ -49,22 +45,21 @@
] ++ common;
# compile-time deps
packages = with unstablePkgs; [
packages = with unstable; [
curl
wget
pkg-config
rustToolchain
] ++ common;
in
with unstablePkgs;
{
devShells.default = mkShell {
devShells.default = unstable.mkShell {
nativeBuildInputs = packages;
buildInputs = libraries;
shellHook = ''
export LD_LIBRARY_PATH=${unstablePkgs.lib.makeLibraryPath libraries}:$LD_LIBRARY_PATH
export XDG_DATA_DIRS=${unstablePkgs.gsettings-desktop-schemas}/share/gsettings-schemas/${unstablePkgs.gsettings-desktop-schemas.name}:${unstablePkgs.gtk3}/share/gsettings-schemas/${unstablePkgs.gtk3.name}:$XDG_DATA_DIRS
export GIO_MODULE_DIR="${unstablePkgs.glib-networking}/lib/gio/modules/"
export LD_LIBRARY_PATH=${unstable.lib.makeLibraryPath libraries}:$LD_LIBRARY_PATH
export XDG_DATA_DIRS=${unstable.gsettings-desktop-schemas}/share/gsettings-schemas/${unstable.gsettings-desktop-schemas.name}:${unstable.gtk3}/share/gsettings-schemas/${unstable.gtk3.name}:$XDG_DATA_DIRS
export GIO_MODULE_DIR="${unstable.glib-networking}/lib/gio/modules/"
'';
};
}