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: 85b1312b0785
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 11a0d130ff6d
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Jun 21, 2018

  1. yabar: fix build

    The stable build for `yabar` is currently broken: https://hydra.nixos.org/build/75989172
    
    Main reason is that the inline function `ya_setup_prefix_suffix` is
    supposed to be an inline function, but was insufficiently declared as
    such which broke the compiler recently with the following message:
    
    ```
    gcc -std=c99 -Iinclude -pedantic -Wall -Os `pkg-config --cflags pango pangocairo libconfig` -DVERSION=\"0.4.0\" -D_POSIX_C_SOURCE=199309L -DYA_INTERNAL -DYA_DYN_COL -DYA_ENV_VARS -DYA_INTERNAL_EWMH  -c -o src/intern_blks/ya_intern.o src/intern_blks/ya_intern.c
    gcc -o yabar src/ya_main.o src/ya_draw.o src/ya_exec.o src/ya_parse.o src/intern_blks/ya_intern.o -lxcb -lpthread -lxcb-randr -lxcb-ewmh `pkg-config --libs pango pangocairo libconfig`
    src/intern_blks/ya_intern.o: In function `ya_int_date':
    ya_intern.c:(.text+0x49): undefined reference to `ya_setup_prefix_suffix'
    src/intern_blks/ya_intern.o: In function `ya_int_uptime':
    ya_intern.c:(.text+0xf4): undefined reference to `ya_setup_prefix_suffix'
    src/intern_blks/ya_intern.o: In function `ya_int_brightness':
    ya_intern.c:(.text+0x1d8): undefined reference to `ya_setup_prefix_suffix'
    src/intern_blks/ya_intern.o: In function `ya_int_bandwidth':
    ya_intern.c:(.text+0x377): undefined reference to `ya_setup_prefix_suffix'
    src/intern_blks/ya_intern.o: In function `ya_int_cpu':
    ya_intern.c:(.text+0x6de): undefined reference to `ya_setup_prefix_suffix'
    src/intern_blks/ya_intern.o:ya_intern.c:(.text+0x924): more undefined references to `ya_setup_prefix_suffix' follow
    collect2: error: ld returned 1 exit status
    make: *** [Makefile:18: yabar] Error 1
    ```
    
    This issue has been fixed on master (see
    geommer/yabar@9779a5e)
    which is why `nixos.yabar-unstable` remained functional.
    Ma27 committed Jun 21, 2018
    Copy the full SHA
    2ae3292 View commit details
    Browse the repository at this point in the history

Commits on Jun 22, 2018

  1. Merge pull request #42346 from Ma27/fix-yabar

    yabar: fix build
    pSub committed Jun 22, 2018
    Copy the full SHA
    11a0d13 View commit details
    Browse the repository at this point in the history