max/nix-super
1
0
Fork 0
mirror of https://github.com/privatevoid-net/nix-super.git synced 2024-11-25 15:26:17 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #10995 from NixOS/meson-remove-symlink-hack

Browse source 
Remove symlink hack from meson packaging
This commit is contained in:
John Ericson 2024-06-30 17:35:46 -04:00 committed by GitHub
commit 10ceb7d173
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 46 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
packaging/dependencies.nix
View file

@ -10,6 +10,33 @@
stdenv, stdenv,
versionSuffix, versionSuffix,
}: }:
let
inherit (pkgs) lib;
localSourceLayer = finalAttrs: prevAttrs:
let
root = ../.;
workDirPath =
# Ideally we'd pick finalAttrs.workDir, but for now `mkDerivation` has
# the requirement that everything except passthru and meta must be
# serialized by mkDerivation, which doesn't work for this.
prevAttrs.workDir;
workDirSubpath = lib.path.removePrefix root workDirPath;
sources = assert prevAttrs.fileset._type == "fileset"; prevAttrs.fileset;
src = lib.fileset.toSource { fileset = sources; inherit root; };
in
{
sourceRoot = "${src.name}/" + workDirSubpath;
inherit src;
# Clear what `derivation` can't/shouldn't serialize; see prevAttrs.workDir.
fileset = null;
workDir = null;
};
in
scope: { scope: {
inherit stdenv versionSuffix; inherit stdenv versionSuffix;
@ -55,4 +82,6 @@ scope: {
CONFIG_ASH_TEST y CONFIG_ASH_TEST y
''; '';
}); });
mkMesonDerivation = f: stdenv.mkDerivation (lib.extends localSourceLayer f);
} }

32
src/libutil/package.nix
View file

@ -1,5 +1,6 @@
{ lib { lib
, stdenv , stdenv
, mkMesonDerivation
, releaseTools , releaseTools
, meson , meson
@ -38,22 +39,22 @@ let
else stdenv.mkDerivation; else stdenv.mkDerivation;
in in
mkDerivation (finalAttrs: { mkMesonDerivation (finalAttrs: {
pname = "nix-util"; pname = "nix-util";
inherit version; inherit version;
src = fileset.toSource { workDir = ./.;
root = ./.; fileset = fileset.unions [
fileset = fileset.unions [ ../../.version
./meson.build ./.version
./meson.options ./meson.build
./linux/meson.build ./meson.options
./unix/meson.build ./linux/meson.build
./windows/meson.build ./unix/meson.build
(fileset.fileFilter (file: file.hasExt "cc") ./.) ./windows/meson.build
(fileset.fileFilter (file: file.hasExt "hh") ./.) (fileset.fileFilter (file: file.hasExt "cc") ./.)
]; (fileset.fileFilter (file: file.hasExt "hh") ./.)
}; ];
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
@ -80,9 +81,10 @@ mkDerivation (finalAttrs: {
disallowedReferences = [ boost ]; disallowedReferences = [ boost ];
preConfigure = preConfigure =
# "Inline" .version so it's not a symlink, and includes the suffix # TODO: change release process to add `pre` in `.version`, remove it before tagging, and restore after.
'' ''
echo ${version} > .version chmod u+w ./.version
echo ${version} > ../../.version
'' ''
# Copy some boost libraries so we don't get all of Boost in our # Copy some boost libraries so we don't get all of Boost in our
# closure. https://github.com/NixOS/nixpkgs/issues/45462 # closure. https://github.com/NixOS/nixpkgs/issues/45462