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

Merge pull request #17685 from matthewbauer/darwin-misc2

Browse Source 
Darwin misc. fixes
This commit is contained in:
Daniel Peebles
2016-08-24 11:52:27 +02:00
committed by GitHub
parent 76223aa4b2 a6faa04ee4
commit 3f337a2b23
44 changed files with 162 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/tools/X11/runningx/default.nix
View File

@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
phases = [ "buildPhase" "installPhase" ];
buildPhase = ''
gcc -O2 -o RunningX $(pkg-config --cflags --libs x11) $src
cc -O2 -o RunningX $(pkg-config --cflags --libs x11) $src
'';
installPhase = ''

2
pkgs/tools/X11/setroot/default.nix
View File

@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
buildInputs = [ libX11 imlib2 ]
++ stdenv.lib.optional enableXinerama libXinerama;
buildFlags = if enableXinerama then "xinerama=1" else "xinerama=0";
buildFlags = "CC=cc " + (if enableXinerama then "xinerama=1" else "xinerama=0");
installFlags = "DESTDIR=$(out) PREFIX=";