diff options
author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2021-08-24 00:29:45 +0200 |
---|---|---|
committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2021-09-30 00:39:55 +0200 |
commit | 660cb973260f62551294f73e0811b37fc10fd467 (patch) | |
tree | 7785e96caabb8024016620777fdf5d39467e1ab1 /flakes | |
parent | 1c732acd070287818ce05acbb86fdf82da9bb763 (diff) | |
download | Nix-660cb973260f62551294f73e0811b37fc10fd467.tar.gz Nix-660cb973260f62551294f73e0811b37fc10fd467.tar.zst Nix-660cb973260f62551294f73e0811b37fc10fd467.zip |
Refactor flakes
Third iteration
Diffstat (limited to 'flakes')
-rw-r--r-- | flakes/libspf2/default.nix | 2 | ||||
-rw-r--r-- | flakes/private/peertube/flake.nix | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/flakes/libspf2/default.nix b/flakes/libspf2/default.nix index a9e5ec3..d22c738 100644 --- a/flakes/libspf2/default.nix +++ b/flakes/libspf2/default.nix | |||
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec { | |||
6 | patches = [ | 6 | patches = [ |
7 | (fetchpatch { | 7 | (fetchpatch { |
8 | name = "fix-variadic-macros.patch"; | 8 | name = "fix-variadic-macros.patch"; |
9 | url = "https://git.archlinux.org/svntogit/community.git/plain/trunk/fix-variadic-macros.patch?h=packages/libspf2"; | 9 | url = "https://github.com/shevek/libspf2/commit/5852828582f556e73751076ad092f72acf7fc8b6.patch"; |
10 | sha256 = "00dqpcgjr9jy2qprgqv2qiyvq8y3wlz4yns9xzabf2064jzqh2ic"; | 10 | sha256 = "00dqpcgjr9jy2qprgqv2qiyvq8y3wlz4yns9xzabf2064jzqh2ic"; |
11 | }) | 11 | }) |
12 | ]; | 12 | ]; |
diff --git a/flakes/private/peertube/flake.nix b/flakes/private/peertube/flake.nix index e16cbaf..e0e0d54 100644 --- a/flakes/private/peertube/flake.nix +++ b/flakes/private/peertube/flake.nix | |||
@@ -16,6 +16,10 @@ | |||
16 | }; | 16 | }; |
17 | 17 | ||
18 | outputs = { self, peertube_origin, peertube_syden }: { | 18 | outputs = { self, peertube_origin, peertube_syden }: { |
19 | overlays = { | ||
20 | peertube_syden = final: prev: { peertube_syden = peertube_syden.defaultPackage."${final.system}"; }; | ||
21 | peertube_origin = final: prev: { peertube_origin = peertube_origin.defaultPackage."${final.system}"; }; | ||
22 | }; | ||
19 | packages.x86_64-linux.peertube = peertube_origin.packages.x86_64-linux.peertube; | 23 | packages.x86_64-linux.peertube = peertube_origin.packages.x86_64-linux.peertube; |
20 | packages.x86_64-linux.peertube_syden = peertube_syden.packages.x86_64-linux.peertube; | 24 | packages.x86_64-linux.peertube_syden = peertube_syden.packages.x86_64-linux.peertube; |
21 | defaultPackage.x86_64-linux = peertube_origin.defaultPackage.x86_64-linux; | 25 | defaultPackage.x86_64-linux = peertube_origin.defaultPackage.x86_64-linux; |