Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
base: 19f7f150a4ab
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 948d8289559e
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Sep 18, 2020

  1. uqm: Fix purity checking error during config phase

    Since commit fb777be, linking programs
    in /tmp will no longer work, since with this commit (hardcoded) /tmp
    will no longer be treated a valid temporary directory by the purity
    checking logic.
    
    Essentially what that logic does is checking whether the link target is
    either relative, in some temporary directory or in the Nix store and if
    that's not the case, an error is thrown like in this case:
    
      gcc -c /tmp/build.24.tmp.c -o /tmp/build.24.tmp.c.o
      gcc /tmp/build.24.tmp.c.o -o /tmp/build.24.tmp.out
      impure path `/tmp/build.24.tmp.out' used in link
      collect2: error: ld returned 1 exit status
    
    Note here, that $TMP and $TMPDIR point to /build while the output here
    still refers to /tmp. This is because the custom build system of uqm
    simply hardcodes /tmp and doesn't honor any of these variables.
    
    To fix this, all we need to do is the latter and we're now using $TMPDIR
    instead of /tmp for these compile-tests during configure.
    
    While the pull request[1] introducing said commit has a few comments
    regarding other issues and it could still be either reverted or changed,
    using $TMPDIR in the uqm build script is entirely backwards-compatible
    and shouldn't hurt in any case.
    
    [1]: #93560
    
    Signed-off-by: aszlig <aszlig@nix.build>
    aszlig committed Sep 18, 2020
    Copy the full SHA
    948d828 View commit details
    Browse the repository at this point in the history