NixOS/nix
NixOS/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2024-09-19 10:50:24 -04:00
Code Activity

flake.nix: Use Nixpkgs convention for package variants

Browse source
This commit is contained in:
Robert Hensing 2024-06-26 03:36:03 +02:00
parent 74b9b77c9f
commit ebf77c79ae
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
flake.nix
View file

@ -153,18 +153,18 @@
''; '';
}; };
libgit2-nix = final.libgit2.overrideAttrs (attrs: { libgit2_nix = final.libgit2.overrideAttrs (attrs: {
src = libgit2; src = libgit2;
version = libgit2.lastModifiedDate; version = libgit2.lastModifiedDate;
cmakeFlags = attrs.cmakeFlags or [] cmakeFlags = attrs.cmakeFlags or []
++ [ "-DUSE_SSH=exec" ]; ++ [ "-DUSE_SSH=exec" ];
}); });
boehmgc-nix = final.boehmgc.override { boehmgc_nix = final.boehmgc.override {
enableLargeConfig = true; enableLargeConfig = true;
}; };
libseccomp-nix = final.libseccomp.overrideAttrs (_: rec { libseccomp_nix = final.libseccomp.overrideAttrs (_: rec {
version = "2.5.5"; version = "2.5.5";
src = final.fetchurl { src = final.fetchurl {
url = "https://github.com/seccomp/libseccomp/releases/download/v${version}/libseccomp-${version}.tar.gz"; url = "https://github.com/seccomp/libseccomp/releases/download/v${version}/libseccomp-${version}.tar.gz";

6
packaging/components.nix
View file

@ -6,9 +6,9 @@ in
# This becomes the pkgs.nixComponents attribute set # This becomes the pkgs.nixComponents attribute set
{ {
inherit stdenv versionSuffix; inherit stdenv versionSuffix;
libseccomp = pkgs.libseccomp-nix; libseccomp = pkgs.libseccomp_nix;
boehmgc = pkgs.boehmgc-nix; boehmgc = pkgs.boehmgc_nix;
libgit2 = pkgs.libgit2-nix; libgit2 = pkgs.libgit2_nix;
busybox-sandbox-shell = pkgs.busybox-sandbox-shell or pkgs.default-busybox-sandbox-shell; busybox-sandbox-shell = pkgs.busybox-sandbox-shell or pkgs.default-busybox-sandbox-shell;
nix = callPackage ../package.nix { }; nix = callPackage ../package.nix { };