2
0
Fork 0

Update Nixpkgs flake input

This commit is contained in:
Emery Hemingway 2020-11-01 20:13:49 +01:00
parent a48dc08001
commit 6889fb09c2
3 changed files with 10 additions and 12 deletions

View File

@ -3,11 +3,11 @@
"genode": { "genode": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1602243357, "lastModified": 1603455398,
"narHash": "sha256-1Q3D8W8xujTW38CxhXvQIFfxeKuLvBoCzmROiMPxVKA=", "narHash": "sha256-/ABZEGffnm6Tp3mem1MbMpL1TQbc+LcprQELvvox0Ks=",
"owner": "genodelabs", "owner": "genodelabs",
"repo": "genode", "repo": "genode",
"rev": "91f82816189c1aad5d03168cc86c4b4946787b5c", "rev": "5be1c793a5c600b37f3df346b7438ad2aced9fc6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -18,16 +18,16 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1603868764, "lastModified": 1604174028,
"narHash": "sha256-WPummiqYWunZJ3sXUN1ez3ww68YZdnR5VhLEttn17Cw=", "narHash": "sha256-b/AMdA8G3JIgErvqNJD0QwiqeD2LWw+aVFLlL9VQK7Y=",
"owner": "NixOS", "owner": "ehmry",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5596cbfb9e914989ffe62cf7e21f332acb3b05b9", "rev": "098487ccb89e3771f4a63a3b2faf500c4002f65e",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "ehmry",
"ref": "release-20.09", "ref": "genodepkgs",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }

View File

@ -6,7 +6,7 @@
flake = false; flake = false;
}; };
inputs.nixpkgs.url = "github:NixOS/nixpkgs/release-20.09"; inputs.nixpkgs.url = "github:ehmry/nixpkgs/genodepkgs";
outputs = { self, genode, nixpkgs }: outputs = { self, genode, nixpkgs }:
let let

View File

@ -110,8 +110,6 @@ in {
solo5-tools = callPackage ./solo5-tools { }; solo5-tools = callPackage ./solo5-tools { };
tup = prev.tup.overrideAttrs (attrs: { setupHook = ./tup/setup-hook.sh; });
zlib = overrideHostAttrs zlib (attrs: { zlib = overrideHostAttrs zlib (attrs: {
postInstall = attrs.postInstall or "" + '' postInstall = attrs.postInstall or "" + ''
pushd ''${!outputLib}/lib pushd ''${!outputLib}/lib