pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #135414 from trofi/fix-imake-vendor

imake: do not skip Linux* vendor definitions

authored by

Luke Granger-Brown and committed by
GitHub 764a52ba 31efc58e

+30 -20
unified split
+4 -2
pkgs/applications/misc/xcruiser/default.nix
··· 12 buildInputs = [ libXt libXaw libXpm libXext ]; 13 14 makeFlags = [ 15 - "BINDIR=$(out)/bin" 16 - "XAPPLOADDIR=$(out)/etc/X11/app-defaults" 17 ]; 18 19 meta = with lib; {
··· 12 buildInputs = [ libXt libXaw libXpm libXext ]; 13 14 makeFlags = [ 15 + "BINDIR=${placeholder "out"}/bin" 16 + "CONFDIR=${placeholder "out"}/etc/X11" 17 + "LIBDIR=${placeholder "out"}/lib/X11" 18 + "XAPPLOADDIR=${placeholder "out"}/etc/X11/app-defaults" 19 ]; 20 21 meta = with lib; {
+2
pkgs/applications/misc/xxkb/default.nix
··· 24 25 makeFlags = [ 26 "BINDIR=${placeholder "out"}/bin" 27 "PIXMAPDIR=${placeholder "out"}/share/xxkb" 28 "XAPPLOADDIR=${placeholder "out"}/etc/X11/app-defaults" 29 "MANDIR=${placeholder "man"}/share/man" 30 ];
··· 24 25 makeFlags = [ 26 "BINDIR=${placeholder "out"}/bin" 27 + "CONFDIR=${placeholder "out"}/etc/X11" 28 "PIXMAPDIR=${placeholder "out"}/share/xxkb" 29 + "LIBDIR=${placeholder "out"}/lib/X11" 30 "XAPPLOADDIR=${placeholder "out"}/etc/X11/app-defaults" 31 "MANDIR=${placeholder "man"}/share/man" 32 ];
+19 -15
pkgs/servers/x11/xorg/imake.patch
··· 1 - diff -Naur imake-1.0.7-orig/imake.c imake-1.0.7/imake.c 2 - --- imake-1.0.7-orig/imake.c 2013-08-17 10:11:50.000000000 +0000 3 - +++ imake-1.0.7/imake.c 2015-02-04 09:41:59.000000000 +0000 4 - @@ -1045,6 +1045,7 @@ 5 - static void 6 - get_distrib(FILE *inFile) 7 - { 8 - +#if 0 9 - struct stat sb; 10 11 - static const char* suse = "/etc/SuSE-release"; 12 - @@ -1090,6 +1091,7 @@ 13 * at the content of /etc/debian_version */ 14 return; 15 } 16 - +#endif 17 /* what's the definitive way to tell what any particular distribution is? */ 18 19 fprintf (inFile, "%s\n", "#define DefaultLinuxDistribution LinuxUnknown"); 20 - @@ -1337,6 +1339,7 @@ 21 static boolean 22 get_gcc(char *cmd) 23 { 24 - +#if 0 25 struct stat sb; 26 static const char* gcc_path[] = { 27 #if defined(linux) || \ 28 - @@ -1385,6 +1388,9 @@ 29 } 30 } 31 return FALSE;
··· 1 + Disable imake autodetection for: 2 + - LinuxDistribution to avoid injection of /usr paths 3 + - gcc to avoid use uf /usr/bin/gcc 4 + 5 + https://github.com/NixOS/nixpkgs/issues/135337 6 + --- a/imake.c 7 + +++ b/imake.c 8 + @@ -1065,6 +1065,7 @@ get_distrib(FILE *inFile) 9 + fprintf (inFile, "%s\n", "#define LinuxWare 11"); 10 + fprintf (inFile, "%s\n", "#define LinuxYggdrasil 12"); 11 12 + +#if 0 /* disable system autodetection. Fall through to LinuxUnknown. */ 13 + # ifdef CROSSCOMPILE 14 + if (CrossCompiling) { 15 + fprintf (inFile, "%s\n", 16 + @@ -1090,6 +1091,7 @@ get_distrib(FILE *inFile) 17 * at the content of /etc/debian_version */ 18 return; 19 } 20 + +#endif 21 /* what's the definitive way to tell what any particular distribution is? */ 22 23 fprintf (inFile, "%s\n", "#define DefaultLinuxDistribution LinuxUnknown"); 24 + @@ -1337,6 +1339,7 @@ get_gcc_version(FILE *inFile, char *name) 25 static boolean 26 get_gcc(char *cmd) 27 { 28 + +#if 0 /* disable gcc autodetection. Fall through to explicitly set. */ 29 struct stat sb; 30 static const char* gcc_path[] = { 31 #if defined(linux) || \ 32 + @@ -1385,6 +1388,9 @@ get_gcc(char *cmd) 33 } 34 } 35 return FALSE;
+5 -3
pkgs/tools/X11/xvkbd/default.nix
··· 13 buildInputs = [ libXt libXaw libXtst xorgproto libXi Xaw3d libXpm ]; 14 installTargets = [ "install" "install.man" ]; 15 makeFlags = [ 16 - "BINDIR=$(out)/bin" 17 - "XAPPLOADDIR=$(out)/etc/X11/app-defaults" 18 - "MANPATH=$(out)/man" 19 ]; 20 21 meta = with lib; {
··· 13 buildInputs = [ libXt libXaw libXtst xorgproto libXi Xaw3d libXpm ]; 14 installTargets = [ "install" "install.man" ]; 15 makeFlags = [ 16 + "BINDIR=${placeholder "out"}/bin" 17 + "CONFDIR=${placeholder "out"}/etc/X11" 18 + "LIBDIR=${placeholder "out"}/lib/X11" 19 + "XAPPLOADDIR=${placeholder "out"}/etc/X11/app-defaults" 20 + "MANPATH=${placeholder "out"}/man" 21 ]; 22 23 meta = with lib; {