From 7fcc4d1b660a871b7239ea09716e6fc442ce5b27 Mon Sep 17 00:00:00 2001 From: wucke13 Date: Wed, 8 Mar 2023 21:59:25 +0100 Subject: [PATCH] simplify flake.nix --- flake.nix | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/flake.nix b/flake.nix index c8e80d0f..9635b6be 100644 --- a/flake.nix +++ b/flake.nix @@ -132,21 +132,15 @@ default = rosenpass; rosenpass = rpDerivation pkgs; rosenpass-oci-image = rosenpassOCI "rosenpass"; - rosenpass-static = rpDerivation pkgs.pkgsStatic; + rosenpass-static-oci-image = rosenpassOCI "rosenpass-static"; # derivation for the release release-package = let version = cargoToml.package.version; - package = - if pkgs.hostPlatform.isLinux then - packages.rosenpass-static - else packages.rosenpass-static; - oci-image = - if pkgs.hostPlatform.isLinux then - packages.rosenpass-static-oci-image - else packages.rosenpass-oci-image; + package = packages.rosenpass-static; + oci-image = packages.rosenpass-static-oci-image; in pkgs.runCommandNoCC "lace-result" { } '' @@ -157,9 +151,7 @@ cp ${oci-image} \ $out/rosenpass-oci-image-${system}-${version}.tar.gz ''; - } // (if pkgs.stdenv.isLinux then rec { - rosenpass-static-oci-image = rosenpassOCI "rosenpass-static"; - } else { }); + }; } ))