kconfig: Bring in a fork of kconfig that has the --force option

This commit is contained in:
Peter Jones 2022-08-11 13:31:47 -07:00
parent d82175bd56
commit 441901b331
No known key found for this signature in database
GPG Key ID: 9DAFAA8D01941E49
2 changed files with 50 additions and 9 deletions

View File

@ -21,6 +21,23 @@
"type": "github"
}
},
"kconfig": {
"flake": false,
"locked": {
"lastModified": 1659981185,
"narHash": "sha256-/WJwEOwD+CluiXtwV8EVPWtGc2DfcKRANSojjCh2n2U=",
"owner": "pjones",
"repo": "kconfig",
"rev": "0bb8111fb6053fe030bda46a6771096c32753015",
"type": "github"
},
"original": {
"owner": "pjones",
"ref": "pjones/force",
"repo": "kconfig",
"type": "github"
}
},
"nixpkgs": {
"locked": {
"lastModified": 1655643053,
@ -37,10 +54,28 @@
"type": "github"
}
},
"nixpkgs_unstable": {
"locked": {
"lastModified": 1660227034,
"narHash": "sha256-bXMlG/YU0IjAod6M625XT1YbUG+/3L9ypk9llYpKeuM=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "964d60ff2e6bc76c0618962da52859603784fa78",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"root": {
"inputs": {
"home-manager": "home-manager",
"nixpkgs": "nixpkgs"
"kconfig": "kconfig",
"nixpkgs": "nixpkgs",
"nixpkgs_unstable": "nixpkgs_unstable"
}
}
},

View File

@ -3,9 +3,13 @@
inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-22.05";
nixpkgs_unstable.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
home-manager.url = "github:nix-community/home-manager/release-22.05";
home-manager.inputs.nixpkgs.follows = "nixpkgs";
kconfig.url = "github:pjones/kconfig/pjones/force";
kconfig.flake = false;
};
outputs = inputs@{ self, ... }:
@ -30,7 +34,10 @@
};
packages = forAllSystems (system:
let pkgs = nixpkgsFor.${system}; in
let
pkgs = nixpkgsFor.${system};
unstable = import inputs.nixpkgs_unstable { inherit system; };
in
{
default = self.packages.${system}.rc2nix;
@ -54,16 +61,15 @@
text = ''ruby ${script/rc2nix.rb} "$@"'';
};
kconfig = unstable.libsForQt5.kdeFrameworks.kconfig.overrideAttrs (_orig: {
src = inputs.kconfig;
});
kconf_update = pkgs.writeShellApplication {
name = "kconf_update";
text =
let kconfig =
pkgs.lib.getLib
pkgs.libsForQt5.kdeFrameworks.kconfig;
in
''
${kconfig}/libexec/kf5/kconf_update "$@"
'';
let kconfig = pkgs.lib.getLib self.packages.${system}.kconfig;
in ''${kconfig}/libexec/kf5/kconf_update "$@"'';
};
});