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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 837cc0767dab
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 795b1555a886
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Oct 7, 2019

  1. vlang: Propagate build inputs, add $LDFLAGS (#70466)

    @Madouura @veprbl
    Madouura authored and veprbl committed Oct 7, 2019
    Copy the full SHA
    795b155 View commit details
Showing with 2 additions and 2 deletions.
  1. +2 −2 pkgs/development/compilers/vlang/default.nix
4 changes: 2 additions & 2 deletions pkgs/development/compilers/vlang/default.nix
View file
Original file line number Diff line number Diff line change
@@ -23,15 +23,15 @@ stdenv.mkDerivation rec {
};

enableParallelBuilding = true;
buildInputs = [ glfw freetype openssl ]
propagatedBuildInputs = [ glfw freetype openssl ]
++ stdenv.lib.optional stdenv.hostPlatform.isUnix upx;

buildPhase = ''
runHook preBuild
cc -std=gnu11 $CFLAGS -w -o v $vc/v.c -lm $LDFLAGS
./v -prod -cflags `$CFLAGS` -o v compiler
# Exclude thirdparty/vschannel as it is windows-specific.
find thirdparty -path thirdparty/vschannel -prune -o -type f -name "*.c" -execdir cc -std=gnu11 $CFLAGS -w -c {} ';'
find thirdparty -path thirdparty/vschannel -prune -o -type f -name "*.c" -execdir cc -std=gnu11 $CFLAGS -w -c {} $LDFLAGS ';'
runHook postBuild
'';