Files
quantenzitrone 7d8132a92c treewide: remove references to the xorg namespace in pkgs (automated)
this creates some eval errors that will be fixed in the next commit

done with the following script:

```fish
\#!/usr/bin/env fish

set packagesjson (nix eval --impure --json --expr '
let
  lib = import ./lib;
in
import pkgs/servers/x11/xorg/default.nix (lib.mapAttrs (
  name: _:
  if name == "lib" then
    lib
  else if name == "config" then
    { allowAliases = false; }
  else
    name
) (__functionArgs (import pkgs/servers/x11/xorg/default.nix))) { }
' | jq)

set one (grep '^    [A-Za-z0-9_-]*$' pkgs/servers/x11/xorg/default.nix | string trim | string replace -r '$' Z | sort | string sub -e -1)
set two (grep '^  [A-Za-z0-9_-]* = [A-Za-z0-9_-]*;$' pkgs/servers/x11/xorg/default.nix | cut -d= -f1 | string trim | string replace -r '$' Z | sort | string sub -e -1)

for arg in $one $two
    set oname $arg
    set nname (echo $packagesjson | jq -r .$oname)

    if test $nname = null
        echo (set_color red)warn:(set_color normal) unknown package xorg.$oname >&2
        continue
    end

    echo $oname "->" $nname

    # replace basic xorg.$name references
    for file in (rg -F "xorg.$oname" --files-with-matches pkgs)
        # special cases
        sd -F "$oname = xorg.$oname;" "$nname = $nname;" $file

        # replace
        sd -F "xorg.$oname" "$nname" $file

        # fixup function arguments

        # prevent duplicate function args
        if grep -E " ($oname|$nname),\$" $file >/dev/null
            continue
        end

        if grep 'xorg\..' $file >/dev/null # case1: there is more so we can't just remove the function arg

            if grep ' xorg,$' $file >/dev/null
                sd ' xorg,$' " xorg,
                $nname," $file

            else if grep ' xorg ? .*,$' $file >/dev/null
                sd 'xorg( ? .*),$' "xorg\$1,
                $nname," $file

            else
                sd -F 'xorg,' "$nname,
                xorg," $file
            end

        else # case there is no more xorg..* so we can just replace the function arg
            sd 'xorg(| ? .*),.*$' "$nname," $file
        end
    end
end

nix fmt
```
2026-01-25 22:28:09 +01:00

116 lines
4.7 KiB
Nix

{
lib,
stdenv,
buildPackages,
targetPackages,
gobject-introspection-unwrapped,
...
}@_args:
# to build, run
# `nix build ".#pkgsCross.aarch64-multiplatform.buildPackages.gobject-introspection"`
# a comment for both depsTargetTargetPropagated's
# add self to buildInputs to avoid needing to add gobject-introspection to buildInputs in addition to nativeBuildInputs
# builds use target-pkg-config to look for gobject-introspection instead of just looking for binaries in $PATH
let
# ensure that `.override` works
args = removeAttrs _args [
"buildPackages"
"targetPackages"
"gobject-introspection-unwrapped"
];
# passing this stdenv to `targetPackages...` breaks due to splicing not working in `.override``
argsForTarget = removeAttrs args [ "stdenv" ];
overriddenUnwrappedGir = gobject-introspection-unwrapped.override args;
# if we have targetPackages.gobject-introspection then propagate that
overridenTargetUnwrappedGir =
if targetPackages ? gobject-introspection-unwrapped then
targetPackages.gobject-introspection-unwrapped.override argsForTarget
else
overriddenUnwrappedGir;
in
# wrap both pkgsCrossX.buildPackages.gobject-introspection and {pkgs,pkgsSomethingExecutableOnBuildSystem).buildPackages.gobject-introspection
if
(!stdenv.hostPlatform.canExecute stdenv.targetPlatform)
&& stdenv.targetPlatform.emulatorAvailable buildPackages
then
overriddenUnwrappedGir.overrideAttrs (previousAttrs: {
pname = "gobject-introspection-wrapped";
passthru = previousAttrs.passthru // {
unwrapped = overriddenUnwrappedGir;
};
dontStrip = true;
depsTargetTargetPropagated = [ overridenTargetUnwrappedGir ];
buildCommand = ''
eval fixupPhase
${lib.concatMapStrings (output: ''
mkdir -p ${"$" + "${output}"}
${lib.getExe buildPackages.lndir} ${overriddenUnwrappedGir.${output}} ${"$" + "${output}"}
'') overriddenUnwrappedGir.outputs}
cp $dev/bin/g-ir-compiler $dev/bin/.g-ir-compiler-wrapped
cp $dev/bin/g-ir-scanner $dev/bin/.g-ir-scanner-wrapped
(
rm "$dev/bin/g-ir-compiler"
rm "$dev/bin/g-ir-scanner"
export bash="${buildPackages.bash}"
export emulator=${lib.escapeShellArg (stdenv.targetPlatform.emulator buildPackages)}
export emulatorwrapper="$dev/bin/g-ir-scanner-qemuwrapper"
export buildlddtree="${buildPackages.pax-utils}/bin/lddtree"
export targetgir="${lib.getDev overridenTargetUnwrappedGir}"
substituteAll "${./wrappers/g-ir-compiler.sh}" "$dev/bin/g-ir-compiler"
substituteAll "${./wrappers/g-ir-scanner.sh}" "$dev/bin/g-ir-scanner"
substituteAll "${./wrappers/g-ir-scanner-lddwrapper.sh}" "$dev/bin/g-ir-scanner-lddwrapper"
substituteAll "${./wrappers/g-ir-scanner-qemuwrapper.sh}" "$dev/bin/g-ir-scanner-qemuwrapper"
chmod +x $dev/bin/g-ir-compiler
chmod +x $dev/bin/g-ir-scanner*
)
''
# when cross-compiling and using the wrapper then when a package looks up the g_ir_X
# variable with pkg-config they'll get the host version which can't be run
# override the variable to use the absolute path to g_ir_X in PATH which can be run
+ ''
cat >> $dev/nix-support/setup-hook <<-'EOF'
override-pkg-config-gir-variables() {
PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_G_IR_SCANNER="$(type -p g-ir-scanner)"
PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_G_IR_COMPILER="$(type -p g-ir-compiler)"
PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_G_IR_GENERATE="$(type -p g-ir-generate)"
export PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_G_IR_SCANNER
export PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_G_IR_COMPILER
export PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_G_IR_GENERATE
}
preConfigureHooks+=(override-pkg-config-gir-variables)
EOF
'';
})
else
overriddenUnwrappedGir.overrideAttrs (previousAttrs: {
pname = "gobject-introspection-wrapped";
passthru = previousAttrs.passthru // {
unwrapped = overriddenUnwrappedGir;
};
dontStrip = true;
# Conditional is for `pkgsCross.x86_64-freebsd.pkgsBuildHost.gobject-introspection` `error: Don't know how to run x86_64-unknown-freebsd executables.`
# `pkgsCross.x86_64-freebsd.buildPackages.python3.withPackages (pp: [ pp.pygobject3 ])`
# Using the python module does not need this propagation
depsTargetTargetPropagated = lib.optionals (stdenv.targetPlatform.emulatorAvailable buildPackages) [
overridenTargetUnwrappedGir
];
buildCommand = ''
eval fixupPhase
${lib.concatMapStrings (output: ''
mkdir -p ${"$" + "${output}"}
${lib.getExe buildPackages.lndir} ${overriddenUnwrappedGir.${output}} ${"$" + "${output}"}
'') overriddenUnwrappedGir.outputs}
'';
})