Merge pull request #314720 from tie/remove-gawkbug

gawk: move gawkbug to gawkInteractive

authored by philiptaron.tngl.sh and committed by GitHub fa70b505 8a977702

+23 -7
+23 -7
pkgs/tools/text/gawk/default.nix
··· 1 { lib, stdenv, fetchurl 2 , runtimeShellPackage 3 # TODO: links -lsigsegv but loses the reference for some reason 4 , withSigsegv ? (false && stdenv.hostPlatform.system != "x86_64-cygwin"), libsigsegv ··· 36 outputs = [ "out" "info" ] 37 ++ lib.optional (!interactive) "man"; 38 39 # no-pma fix 40 - nativeBuildInputs = [ autoreconfHook ] 41 - ++ lib.optional (doCheck && stdenv.isLinux) glibcLocales; 42 43 - buildInputs = [ 44 runtimeShellPackage 45 - ] ++ lib.optional withSigsegv libsigsegv 46 - ++ lib.optional interactive readline 47 - ++ lib.optional stdenv.isDarwin locale; 48 49 configureFlags = [ 50 (if withSigsegv then "--with-libsigsegv-prefix=${libsigsegv}" else "--without-libsigsegv") ··· 57 58 inherit doCheck; 59 60 - postInstall = '' 61 rm "$out"/bin/gawk-* 62 ln -s gawk.1 "''${!outputMan}"/share/man/man1/awk.1 63 '';
··· 1 { lib, stdenv, fetchurl 2 + , removeReferencesTo 3 , runtimeShellPackage 4 # TODO: links -lsigsegv but loses the reference for some reason 5 , withSigsegv ? (false && stdenv.hostPlatform.system != "x86_64-cygwin"), libsigsegv ··· 37 outputs = [ "out" "info" ] 38 ++ lib.optional (!interactive) "man"; 39 40 + strictDeps = true; 41 + 42 # no-pma fix 43 + nativeBuildInputs = [ 44 + autoreconfHook 45 + ] ++ lib.optionals interactive [ 46 + removeReferencesTo 47 + ] ++ lib.optionals (doCheck && stdenv.isLinux) [ 48 + glibcLocales 49 + ]; 50 51 + buildInputs = lib.optionals interactive [ 52 runtimeShellPackage 53 + readline 54 + ] ++ lib.optionals withSigsegv [ 55 + libsigsegv 56 + ] ++ lib.optionals stdenv.isDarwin [ 57 + locale 58 + ]; 59 60 configureFlags = [ 61 (if withSigsegv then "--with-libsigsegv-prefix=${libsigsegv}" else "--without-libsigsegv") ··· 68 69 inherit doCheck; 70 71 + postInstall = (if interactive then '' 72 + remove-references-to -t "$NIX_CC" "$out"/bin/gawkbug 73 + patchShebangs --host "$out"/bin/gawkbug 74 + '' else '' 75 + rm "$out"/bin/gawkbug 76 + '') + '' 77 rm "$out"/bin/gawk-* 78 ln -s gawk.1 "''${!outputMan}"/share/man/man1/awk.1 79 '';