use gimp for wayland from an upstream PR
This commit is contained in:
parent
c0daa9e6e9
commit
6690b89615
3 changed files with 30 additions and 7 deletions
29
flake.lock
generated
29
flake.lock
generated
|
@ -974,6 +974,22 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"nixpkgs-gimp": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1735507908,
|
||||||
|
"narHash": "sha256-VA+khC0S0di6w5Yv1kBNRpAihnt2prT/ehQzsKMhEoA=",
|
||||||
|
"owner": "jtojnar",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"rev": "771cf18187fefcfaababd35834917c621447fee8",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "jtojnar",
|
||||||
|
"ref": "gimp-meson",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"nixpkgs-kanidm": {
|
"nixpkgs-kanidm": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1729071019,
|
"lastModified": 1729071019,
|
||||||
|
@ -1035,11 +1051,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs-unstable": {
|
"nixpkgs-unstable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1733212471,
|
"lastModified": 1739446958,
|
||||||
"narHash": "sha256-M1+uCoV5igihRfcUKrr1riygbe73/dzNnzPsmaLCmpo=",
|
"narHash": "sha256-+/bYK3DbPxMIvSL4zArkMX0LQvS7rzBKXnDXLfKyRVc=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "55d15ad12a74eb7d4646254e13638ad0c4128776",
|
"rev": "2ff53fe64443980e139eaa286017f53f88336dd0",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -1296,6 +1312,7 @@
|
||||||
],
|
],
|
||||||
"nixpkgs-2211": "nixpkgs-2211",
|
"nixpkgs-2211": "nixpkgs-2211",
|
||||||
"nixpkgs-2411": "nixpkgs-2411",
|
"nixpkgs-2411": "nixpkgs-2411",
|
||||||
|
"nixpkgs-gimp": "nixpkgs-gimp",
|
||||||
"nixpkgs-kanidm": "nixpkgs-kanidm",
|
"nixpkgs-kanidm": "nixpkgs-kanidm",
|
||||||
"nixpkgs-logseq": "nixpkgs-logseq",
|
"nixpkgs-logseq": "nixpkgs-logseq",
|
||||||
"nixpkgs-unstable": "nixpkgs-unstable",
|
"nixpkgs-unstable": "nixpkgs-unstable",
|
||||||
|
@ -1590,11 +1607,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1733222881,
|
"lastModified": 1738953846,
|
||||||
"narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=",
|
"narHash": "sha256-yrK3Hjcr8F7qS/j2F+r7C7o010eVWWlm4T1PrbKBOxQ=",
|
||||||
"owner": "numtide",
|
"owner": "numtide",
|
||||||
"repo": "treefmt-nix",
|
"repo": "treefmt-nix",
|
||||||
"rev": "49717b5af6f80172275d47a418c9719a31a78b53",
|
"rev": "4f09b473c936d41582dd744e19f34ec27592c5fd",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
@ -111,6 +111,8 @@
|
||||||
url = "github:nix-community/NUR";
|
url = "github:nix-community/NUR";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
nixpkgs-gimp.url = "github:jtojnar/nixpkgs/gimp-meson";
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs =
|
outputs =
|
||||||
|
@ -336,6 +338,9 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
inherit local-xwayland;
|
inherit local-xwayland;
|
||||||
|
|
||||||
|
inherit (inputs'.nixpkgs-gimp.legacyPackages) gimp;
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
formatter =
|
formatter =
|
||||||
|
|
|
@ -248,6 +248,7 @@ in
|
||||||
|
|
||||||
(pkgs.callPackage "${repoFlake.inputs.nixpkgs-logseq}/pkgs/by-name/lo/logseq/package.nix" { })
|
(pkgs.callPackage "${repoFlake.inputs.nixpkgs-logseq}/pkgs/by-name/lo/logseq/package.nix" { })
|
||||||
])
|
])
|
||||||
|
++ (with repoFlake.packages.${pkgs.system}; [ gimp ])
|
||||||
++ (lib.lists.optionals (!pkgs.stdenv.targetPlatform.isAarch64) [
|
++ (lib.lists.optionals (!pkgs.stdenv.targetPlatform.isAarch64) [
|
||||||
pkgsUnstable.ledger-live-desktop
|
pkgsUnstable.ledger-live-desktop
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue