public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

treewide: NIX_*_FLAGS -> string

Browse Source
This commit is contained in:
Robin Gloster
2019-10-30 12:34:47 +01:00
committed by Jan Tojnar
parent f9f46dc327
commit 313da176d3
89 changed files with 108 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/tools/misc/osm2pgsql/default.nix
View File

@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
buildInputs = [ expat proj bzip2 zlib boost postgresql lua ];
NIX_CFLAGS_COMPILE = [ "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H" ];
NIX_CFLAGS_COMPILE = "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H";
meta = with stdenv.lib; {
description = "OpenStreetMap data to PostgreSQL converter";

2
pkgs/tools/misc/parcellite/default.nix
View File

@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook intltool pkgconfig wrapGAppsHook ];
buildInputs = [ gtk2 hicolor-icon-theme ];
NIX_LDFLAGS = [ "-lgio-2.0" ];
NIX_LDFLAGS = "-lgio-2.0";
preFixup = ''
# Need which and xdotool on path to fix auto-pasting.

2
pkgs/tools/misc/qjoypad/default.nix
View File

@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ libX11 libXtst qt4 ];
NIX_LDFLAGS = [ "-lX11" ];
NIX_LDFLAGS = "-lX11";
patchPhase = ''
cd src
substituteInPlace config --replace /bin/bash ${stdenv.shell}

4
pkgs/tools/misc/snapper/default.nix
View File

@@ -49,9 +49,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
NIX_CFLAGS_COMPILE = [
"-I${libxml2.dev}/include/libxml2"
];
NIX_CFLAGS_COMPILE = "-I${libxml2.dev}/include/libxml2";
postInstall = ''
rm -r $out/etc/cron.*

2
pkgs/tools/misc/wyrd/default.nix
View File

@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "0zlrg602q781q8dij62lwdprpfliyy9j1rqfqcz8p2wgndpivddj";
};
NIX_CFLAGS_COMPILE = [ "-DNCURSES_INTERNALS=1" ];
NIX_CFLAGS_COMPILE = "-DNCURSES_INTERNALS=1";
preConfigure = ''
substituteInPlace curses/curses.ml --replace 'pp gcc' "pp $CC"