commit c53449ce57f26de17532f0dea727b58db68b337e · pyrox.dev/nixpkgs

+2 -2

pkgs/applications/audio/mpg123/default.nix

···

       1
       1
        
       { stdenv

     

       2
       2
        
       , fetchurl, alsaLib

     

       3
       3
       -
       , buildPlatform, hostPlatform

     

       3
       3
       +
       , hostPlatform

     

       4
       4
        
       }:

     

       5
       5
        
       

     

       6
       6
        
       stdenv.mkDerivation rec {

     
···

       13
       13
        
       

     

       14
       14
        
         buildInputs = stdenv.lib.optional (!stdenv.isDarwin) alsaLib;

     

       15
       15
        
       

     

       16
       16
       -
         ${if buildPlatform != hostPlatform then "configureFlags" else null} =

     

       16
       16
       +
         configureFlags =

     

       17
       17
        
           stdenv.lib.optional (hostPlatform ? mpg123) "--with-cpu=${hostPlatform.mpg123.cpu}";

     

       18
       18
        
       

     

       19
       19
        
         meta = {

+7 -1

pkgs/applications/editors/ed/default.nix

···

       32
       32
        
           */

     

       33
       33
        
         doCheck = !(hostPlatform.isDarwin || hostPlatform != buildPlatform);

     

       34
       34
        
       

     

       35
       35
       -
         configureFlags = if hostPlatform == buildPlatform then null else [

     

       35
       35
       +
         # TODO(@Ericson2314): Use placeholder to make this a configure flag once Nix

     

       36
       36
       +
         # 1.12 is released.

     

       37
       37
       +
         preConfigure = ''

     

       38
       38
       +
           export DESTDIR=$out

     

       39
       39
       +
         '';

     

       40
       40
       +
       

     

       41
       41
       +
         configureFlags = [

     

       36
       42
        
           "--exec-prefix=${stdenv.cc.prefix}"

     

       37
       43
        
           "CC=${stdenv.cc.prefix}cc"

     

       38
       44
        
         ];

+1 -2

pkgs/development/compilers/rust/rustc.nix

···

       138
       138
        
       

     

       139
       139
        
         inherit doCheck;

     

       140
       140
        
       

     

       141
       141
       -
         ${if buildPlatform == hostPlatform then "dontSetConfigureCross" else null} = true;

     

       142
       142
       -
         ${if buildPlatform != hostPlatform then "configurePlatforms" else null} = [];

     

       141
       141
       +
         configurePlatforms = [];

     

       143
       142
        
       

     

       144
       143
        
         # https://github.com/NixOS/nixpkgs/pull/21742#issuecomment-272305764

     

       145
       144
        
         # https://github.com/rust-lang/rust/issues/30181

+2 -2

pkgs/development/libraries/glew/1.10.nix

···

       38
       38
        
           cp -r README.txt LICENSE.txt doc $out/share/doc/glew

     

       39
       39
        
         '';

     

       40
       40
        
       

     

       41
       41
       -
         makeFlags = if hostPlatform == buildPlatform then null else [

     

       42
       42
       -
           "SYSTEM=${if hostPlatform.isMinGW then "mingw" else hostPlatform.parsed.kernel}"

     

       41
       41
       +
         makeFlags = [

     

       42
       42
       +
           "SYSTEM=${if hostPlatform.isMinGW then "mingw" else hostPlatform.parsed.kernel.name}"

     

       43
       43
        
         ];

     

       44
       44
        
       

     

       45
       45
        
         meta = with stdenv.lib; {

+2 -2

pkgs/development/libraries/glew/default.nix

···

       39
       39
        
           rm $out/lib/*.a

     

       40
       40
        
         '';

     

       41
       41
        
       

     

       42
       42
       -
         makeFlags = if hostPlatform == buildPlatform then null else [

     

       43
       43
       -
           "SYSTEM=${if hostPlatform.isMinGW then "mingw" else hostPlatform.parsed.kernel}"

     

       42
       42
       +
         makeFlags = [

     

       43
       43
       +
           "SYSTEM=${if hostPlatform.isMinGW then "mingw" else hostPlatform.parsed.kernel.name}"

     

       44
       44
        
         ];

     

       45
       45
        
       

     

       46
       46
        
         meta = with stdenv.lib; {

pkgs/development/libraries/libelf/cross-ar.patch pkgs/development/libraries/libelf/dont-hardcode-ar.patch

+2 -3

pkgs/development/libraries/libelf/default.nix

···

       11
       11
        
           sha256 = "0vf7s9dwk2xkmhb79aigqm0x0yfbw1j0b9ksm51207qwr179n6jr";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         # TODO(@Ericson2314) Make unconditional next hash break

     

       15
       15
       -
         patches = if hostPlatform == buildPlatform then null else [

     

       16
       16
       -
           ./cross-ar.patch

     

       14
       14
       +
         patches = [

     

       15
       15
       +
           ./dont-hardcode-ar.patch

     

       17
       16
        
         ];

     

       18
       17
        
       

     

       19
       18
        
         doCheck = true;

+27 -31

pkgs/development/libraries/zlib/default.nix

···

       4
       4
        
       , static ? false

     

       5
       5
        
       }:

     

       6
       6
        
       

     

       7
       7
       -
       let version = "1.2.11"; in

     

       8
       8
       -
       

     

       9
       7
        
       stdenv.mkDerivation rec {

     

       10
       8
        
         name = "zlib-${version}";

     

       9
       9
       +
         version = "1.2.11";

     

       11
       10
        
       

     

       12
       11
        
         src = fetchurl {

     

       13
       12
        
           urls =

     
···

       19
       18
        
       

     

       20
       19
        
         patches = stdenv.lib.optional hostPlatform.isCygwin ./disable-cygwin-widechar.patch;

     

       21
       20
        
       

     

       22
       22
       -
         postPatch = stdenv.lib.optionalString stdenv.isDarwin ''

     

       21
       21
       +
         postPatch = stdenv.lib.optionalString hostPlatform.isDarwin ''

     

       23
       22
        
           substituteInPlace configure \

     

       24
       23
        
             --replace '/usr/bin/libtool' 'ar' \

     

       25
       24
        
             --replace 'AR="libtool"' 'AR="ar"' \

     
···

       30
       29
        
         setOutputFlags = false;

     

       31
       30
        
         outputDoc = "dev"; # single tiny man3 page

     

       32
       31
        
       

     

       33
       33
       -
         # TODO(@Dridus) CC set by cc-wrapper setup-hook, so just empty out the preConfigure script when cross building, but leave the old incorrect script when not

     

       34
       34
       -
         # cross building to avoid hash breakage. Once hash breakage is acceptable, remove preConfigure entirely.

     

       35
       35
       -
         preConfigure = stdenv.lib.optionalString (hostPlatform == buildPlatform) ''

     

       36
       36
       -
           if test -n "$crossConfig"; then

     

       37
       37
       -
             export CC=$crossConfig-gcc

     

       38
       38
       -
           fi

     

       39
       39
       -
         '';

     

       40
       40
       -
       

     

       41
       32
        
         # FIXME needs gcc 4.9 in bootstrap tools

     

       42
       33
        
         hardeningDisable = [ "stackprotector" ];

     

       43
       34
        
       

     
···

       49
       40
        
           # jww (2015-01-06): Sometimes this library install as a .so, even on

     

       50
       41
        
           # Darwin; others time it installs as a .dylib.  I haven't yet figured out

     

       51
       42
        
           # what causes this difference.

     

       52
       52
       -
         + stdenv.lib.optionalString stdenv.isDarwin ''

     

       43
       43
       +
         + stdenv.lib.optionalString hostPlatform.isDarwin ''

     

       53
       44
        
           for file in $out/lib/*.so* $out/lib/*.dylib* ; do

     

       54
       45
        
             install_name_tool -id "$file" $file

     

       55
       46
        
           done

     

       47
       47
       +
         ''

     

       48
       48
       +
           # Non-typical naming confuses libtool which then refuses to use zlib's DLL

     

       49
       49
       +
           # in some cases, e.g. when compiling libpng.

     

       50
       50
       +
         + stdenv.lib.optionalString (hostPlatform.libc == "msvcrt") ''

     

       51
       51
       +
           ln -s zlib1.dll $out/bin/libz.dll

     

       56
       52
        
         '';

     

       57
       53
        
       

     

       58
       54
        
         # As zlib takes part in the stdenv building, we don't want references

     

       59
       55
        
         # to the bootstrap-tools libgcc (as uses to happen on arm/mips)

     

       60
       60
       -
         NIX_CFLAGS_COMPILE = stdenv.lib.optionalString (!stdenv.isDarwin) "-static-libgcc";

     

       56
       56
       +
         NIX_CFLAGS_COMPILE = stdenv.lib.optionalString (!hostPlatform.isDarwin) "-static-libgcc";

     

       61
       57
        
       

     

       62
       62
       -
         crossAttrs = {

     

       63
       63
       -
           dontStrip = static;

     

       64
       64
       -
           configurePlatforms = [];

     

       65
       65
       -
         } // stdenv.lib.optionalAttrs (hostPlatform.libc == "msvcrt") {

     

       66
       66
       -
           installFlags = [

     

       67
       67
       -
             "BINARY_PATH=$(out)/bin"

     

       68
       68
       -
             "INCLUDE_PATH=$(dev)/include"

     

       69
       69
       -
             "LIBRARY_PATH=$(out)/lib"

     

       70
       70
       -
           ];

     

       71
       71
       -
           makeFlags = [

     

       72
       72
       -
             "-f" "win32/Makefile.gcc"

     

       73
       73
       -
             "PREFIX=${stdenv.cc.prefix}"

     

       74
       74
       -
           ] ++ stdenv.lib.optional (!static) "SHARED_MODE=1";

     

       58
       58
       +
         dontStrip = hostPlatform != buildPlatform && static;

     

       59
       59
       +
         configurePlatforms = [];

     

       60
       60
       +
       

     

       61
       61
       +
         installFlags = stdenv.lib.optionals (hostPlatform.libc == "msvcrt") [

     

       62
       62
       +
           "BINARY_PATH=$(out)/bin"

     

       63
       63
       +
           "INCLUDE_PATH=$(dev)/include"

     

       64
       64
       +
           "LIBRARY_PATH=$(out)/lib"

     

       65
       65
       +
         ];

     

       66
       66
       +
       

     

       67
       67
       +
         makeFlags = [

     

       68
       68
       +
           "PREFIX=${stdenv.cc.prefix}"

     

       69
       69
       +
         ] ++ stdenv.lib.optionals (hostPlatform.libc == "msvcrt") [

     

       70
       70
       +
           "-f" "win32/Makefile.gcc"

     

       71
       71
       +
         ] ++ stdenv.lib.optionals (!static) [

     

       72
       72
       +
           "SHARED_MODE=1"

     

       73
       73
       +
         ];

     

       75
       74
        
       

     

       76
       76
       -
           # Non-typical naming confuses libtool which then refuses to use zlib's DLL

     

       77
       77
       -
           # in some cases, e.g. when compiling libpng.

     

       78
       78
       -
           postInstall = postInstall + "ln -s zlib1.dll $out/bin/libz.dll";

     

       75
       75
       +
         passthru = {

     

       76
       76
       +
           inherit version;

     

       79
       77
        
         };

     

       80
       80
       -
       

     

       81
       81
       -
         passthru.version = version;

     

       82
       78
        
       

     

       83
       79
        
         meta = with stdenv.lib; {

     

       84
       80
        
           description = "Lossless data-compression library";

+10 -2

pkgs/development/tools/misc/binutils/default.nix

···

       8
       8
        
         version = "2.28";

     

       9
       9
        
         basename = "binutils-${version}";

     

       10
       10
        
         inherit (stdenv.lib) optional optionals optionalString;

     

       11
       11
       +
         # The prefix prepended to binary names to allow multiple binuntils on the

     

       12
       12
       +
         # PATH to both be usable.

     

       13
       13
       +
         prefix = optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-";

     

       11
       14
        
       in

     

       12
       15
        
       

     

       13
       16
        
       stdenv.mkDerivation rec {

     

       14
       14
       -
         name = optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-" + basename;

     

       17
       17
       +
         name = prefix + basename;

     

       15
       18
        
       

     

       16
       19
        
         src = fetchurl {

     

       17
       20
        
           url = "mirror://gnu/binutils/${basename}.tar.bz2";

     
···

       78
       81
        
           then "-Wno-string-plus-int -Wno-deprecated-declarations"

     

       79
       82
        
           else "-static-libgcc";

     

       80
       83
        
       

     

       84
       84
       +
         # TODO(@Ericson2314): Always pass "--target" and always prefix.

     

       85
       85
       +
         configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";

     

       81
       86
        
         configureFlags =

     

       82
       87
        
           [ "--enable-shared" "--enable-deterministic-archives" "--disable-werror" ]

     

       83
       88
        
           ++ optional (stdenv.system == "mips64el-linux") "--enable-fix-loongson2f-nop"

     

       84
       84
       -
           ++ optional (targetPlatform != hostPlatform) "--target=${targetPlatform.config}" # TODO: make this unconditional

     

       85
       89
        
           ++ optionals gold [ "--enable-gold" "--enable-plugins" ]

     

       86
       90
        
           ++ optional (stdenv.system == "i686-linux") "--enable-targets=x86_64-linux-gnu";

     

       87
       91
        
       

     

       88
       92
        
         enableParallelBuilding = true;

     

       93
       93
       +
       

     

       94
       94
       +
         passthru = {

     

       95
       95
       +
           inherit prefix;

     

       96
       96
       +
         };

     

       89
       97
        
       

     

       90
       98
        
         meta = with stdenv.lib; {

     

       91
       99
        
           description = "Tools for manipulating binaries (linker, assembler, etc.)";

+3 -2

pkgs/development/tools/misc/gdb/default.nix

···

       48
       48
        
       

     

       49
       49
        
         NIX_CFLAGS_COMPILE = "-Wno-format-nonliteral";

     

       50
       50
        
       

     

       51
       51
       +
         # TODO(@Ericson2314): Always pass "--target" and always prefix.

     

       52
       52
       +
         configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";

     

       53
       53
       +
       

     

       51
       54
        
         configureFlags = with stdenv.lib; [

     

       52
       55
        
           "--with-gmp=${gmp.dev}" "--with-mpfr=${mpfr.dev}" "--with-system-readline"

     

       53
       56
        
           "--with-system-zlib" "--with-expat" "--with-libexpat-prefix=${expat.dev}"

     
···

       55
       58
        
             # TODO(@Ericson2314): make this conditional on whether host platform is NixOS

     

       56
       59
        
             "--with-separate-debug-dir=/run/current-system/sw/lib/debug"

     

       57
       60
        
           ++ stdenv.lib.optional (!pythonSupport) "--without-python"

     

       58
       58
       -
           # TODO(@Ericson2314): This should be done in stdenv, not per-package

     

       59
       59
       -
           ++ stdenv.lib.optional (targetPlatform != hostPlatform) "--target=${targetPlatform.config}"

     

       60
       61
        
           ++ stdenv.lib.optional multitarget "--enable-targets=all";

     

       61
       62
        
       

     

       62
       63
        
         postInstall =

+9 -4

pkgs/os-specific/darwin/binutils/default.nix

···

       2
       2
        
       , hostPlatform, targetPlatform

     

       3
       3
        
       }:

     

       4
       4
        
       

     

       5
       5
       +
       # Make sure both underlying packages claim to have prepended their binaries

     

       6
       6
       +
       # with the same prefix.

     

       7
       7
       +
       assert binutils-raw.prefix == cctools.prefix;

     

       8
       8
       +
       

     

       5
       9
        
       let

     

       6
       6
       -
         prefix = stdenv.lib.optionalString

     

       7
       7
       -
           (targetPlatform != hostPlatform)

     

       8
       8
       -
           "${targetPlatform.config}-";

     

       9
       9
       -
       

     

       10
       10
       +
         inherit (binutils-raw) prefix;

     

       10
       11
        
         cmds = [

     

       11
       12
        
           "ar" "ranlib" "as" "dsymutil" "install_name_tool"

     

       12
       13
        
           "ld" "strip" "otool" "lipo" "nm" "strings" "size"

     
···

       50
       51
        
       

     

       51
       52
        
           ln -s ${cctools}/libexec $out/libexec

     

       52
       53
        
         '';

     

       54
       54
       +
       

     

       55
       55
       +
         passthru = {

     

       56
       56
       +
           inherit prefix;

     

       57
       57
       +
         };

     

       53
       58
        
       }

+9 -6

pkgs/os-specific/darwin/cctools/port.nix

···

       1
       1
        
       { stdenv, fetchFromGitHub, makeWrapper, autoconf, automake, libtool_2

     

       2
       2
        
       , llvm, libcxx, libcxxabi, clang, libuuid

     

       3
       3
        
       , libobjc ? null, maloader ? null, xctoolchain ? null

     

       4
       4
       -
       , buildPlatform, hostPlatform, targetPlatform

     

       4
       4
       +
       , hostPlatform, targetPlatform

     

       5
       5
        
       }:

     

       6
       6
        
       

     

       7
       7
        
       let

     

       8
       8
       +
         # The prefix prepended to binary names to allow multiple binuntils on the

     

       9
       9
       +
         # PATH to both be usable.

     

       8
       10
        
         prefix = stdenv.lib.optionalString

     

       9
       11
        
           (targetPlatform != hostPlatform)

     

       10
       12
        
           "${targetPlatform.config}-";

     
···

       38
       40
        
       

     

       39
       41
        
           enableParallelBuilding = true;

     

       40
       42
        
       

     

       43
       43
       +
           # TODO(@Ericson2314): Always pass "--target" and always prefix.

     

       44
       44
       +
           configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";

     

       41
       45
        
           configureFlags = stdenv.lib.optionals (!stdenv.isDarwin) [

     

       42
       46
        
             "CXXFLAGS=-I${libcxx}/include/c++/v1"

     

       43
       43
       -
           ] ++ stdenv.lib.optionals (targetPlatform != buildPlatform) [

     

       44
       44
       -
             # TODO make unconditional next hash break

     

       45
       45
       -
             "--build=${buildPlatform.config}"

     

       46
       46
       -
             "--host=${hostPlatform.config}"

     

       47
       47
       -
             "--target=${targetPlatform.config}"

     

       48
       47
        
           ];

     

       49
       48
        
       

     

       50
       49
        
           postPatch = ''

     
···

       103
       102
        
                 ln -s "$out/bin/${targetPlatform.config}-$tool" "$out/bin/$tool"

     

       104
       103
        
               done

     

       105
       104
        
             '';

     

       105
       105
       +
       

     

       106
       106
       +
           passthru = {

     

       107
       107
       +
             inherit prefix;

     

       108
       108
       +
           };

     

       106
       109
        
       

     

       107
       110
        
           meta = {

     

       108
       111
        
             homepage = "http://www.opensource.apple.com/source/cctools/";

+1 -5

pkgs/os-specific/linux/busybox/default.nix

···

       63
       63
        
           CONFIG_DEFAULT_SETFONT_DIR "/etc/kbd"

     

       64
       64
        
       

     

       65
       65
        
           ${extraConfig}

     

       66
       66
       -
           $extraCrossConfig

     

       66
       66
       +
           CONFIG_CROSS_COMPILER_PREFIX "${stdenv.cc.prefix}"

     

       67
       67
        
           EOF

     

       68
       68
        
       

     

       69
       69
        
           make oldconfig

     
···

       78
       78
        
         nativeBuildInputs = lib.optional (hostPlatform != buildPlatform) buildPackages.stdenv.cc;

     

       79
       79
        
       

     

       80
       80
        
         buildInputs = lib.optionals (enableStatic && !useMusl) [ stdenv.cc.libc stdenv.cc.libc.static ];

     

       81
       81
       -
       

     

       82
       82
       -
         extraCrossConfig = if hostPlatform == buildPlatform then null else ''

     

       83
       83
       -
           CONFIG_CROSS_COMPILER_PREFIX "${stdenv.cc.prefix}"

     

       84
       84
       -
         '';

     

       85
       81
        
       

     

       86
       82
        
         enableParallelBuilding = true;

     

       87
       83

+3 -1

pkgs/tools/archivers/unzip/cross-cc.patch pkgs/tools/archivers/unzip/dont-hardcode-cc.patch

···

       1
       1
        
       --- a/unix/Makefile

     

       2
       2
        
       +++ b/unix/Makefile

     

       3
       3
       -
       @@ -42,9 +42,7 @@

     

       3
       3
       +
       @@ -42,9 +42,9 @@

     

       4
       4
        
        # such as -DDOSWILD).

     

       5
       5
        
        

     

       6
       6
        
        # UnZip flags

     

       7
       7
        
       -CC = cc#	try using "gcc" target rather than changing this (CC and LD

     

       8
       8
       +
       +CC ?= cc#	try using "gcc" target rather than changing this (CC and LD

     

       8
       9
        
        LD = $(CC)#	must match, else "unresolved symbol:  ___main" is possible)

     

       9
       10
        
       -AS = as

     

       11
       11
       +
       +AS ?= as

     

       10
       12
        
        LOC = $(D_USE_BZ2) $(LOCAL_UNZIP)

     

       11
       13
        
        AF = $(LOC)

     

       12
       14
        
        CFLAGS = -O

+2 -3

pkgs/tools/archivers/unzip/default.nix

···

       1
       1
        
       { stdenv, fetchurl

     

       2
       2
        
       , bzip2

     

       3
       3
        
       , enableNLS ? false, libnatspec

     

       4
       4
       -
       , buildPlatform, hostPlatform

     

       5
       4
        
       }:

     

       6
       5
        
       

     

       7
       6
        
       stdenv.mkDerivation {

     
···

       23
       22
        
           ./CVE-2015-7697.diff

     

       24
       23
        
           ./CVE-2014-9913.patch

     

       25
       24
        
           ./CVE-2016-9844.patch

     

       25
       25
       +
           ./dont-hardcode-cc.patch

     

       26
       26
        
         ] ++ stdenv.lib.optional enableNLS

     

       27
       27
        
           (fetchurl {

     

       28
       28
        
             url = "http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/app-arch/unzip/files/unzip-6.0-natspec.patch?revision=1.1";

     

       29
       29
        
             name = "unzip-6.0-natspec.patch";

     

       30
       30
        
             sha256 = "67ab260ae6adf8e7c5eda2d1d7846929b43562943ec4aff629bd7018954058b1";

     

       31
       31
       -
           })

     

       32
       32
       -
           ++ stdenv.lib.optional (hostPlatform != buildPlatform) ./cross-cc.patch;

     

       31
       31
       +
           });

     

       33
       32
        
       

     

       34
       33
        
         nativeBuildInputs = [ bzip2 ];

     

       35
       34
        
         buildInputs = [ bzip2 ] ++ stdenv.lib.optional enableNLS libnatspec;

+3 -3

pkgs/tools/misc/coreutils/default.nix

···

       70
       70
        
           && builtins.storeDir == "/nix/store";

     

       71
       71
        
       

     

       72
       72
        
         # Prevents attempts of running 'help2man' on cross-built binaries.

     

       73
       73
       -
         ${if hostPlatform == buildPlatform then null else "PERL"} = "missing";

     

       73
       73
       +
         PERL = if hostPlatform == buildPlatform then null else "missing";

     

       74
       74
        
       

     

       75
       75
        
         # Saw random failures like ‘help2man: can't get '--help' info from

     

       76
       76
        
         # man/sha512sum.td/sha512sum’.

     
···

       83
       83
        
       

     

       84
       84
        
         # Works around a bug with 8.26:

     

       85
       85
        
         # Makefile:3440: *** Recursive variable 'INSTALL' references itself (eventually).  Stop.

     

       86
       86
       -
         ${if hostPlatform == buildPlatform then null else "preInstall"} = ''

     

       86
       86
       +
         preInstall = optionalString (hostPlatform != buildPlatform) ''

     

       87
       87
        
           sed -i Makefile -e 's|^INSTALL =.*|INSTALL = ${buildPackages.coreutils}/bin/install -c|'

     

       88
       88
        
         '';

     

       89
       89
        
       

     

       90
       90
       -
         ${if hostPlatform == buildPlatform then null else "postInstall"} = ''

     

       90
       90
       +
         postInstall = optionalString (hostPlatform != buildPlatform) ''

     

       91
       91
        
           rm $out/share/man/man1/*

     

       92
       92
        
           cp ${buildPackages.coreutils}/share/man/man1/* $out/share/man/man1

     

       93
       93
        
         '';

-5

pkgs/tools/system/ddrescue/default.nix

···

       17
       17
        
       

     

       18
       18
        
         doCheck = hostPlatform == buildPlatform;

     

       19
       19
        
       

     

       20
       20
       -
         ${if hostPlatform != buildPlatform then "crossPlatforms" else null} = [ ];

     

       21
       21
       -
         ${if hostPlatform != buildPlatform then "configureFlags" else null} = [

     

       22
       22
       -
           "CXX=${stdenv.cc.prefix}c++"

     

       23
       23
       -
         ];

     

       24
       24
       -
       

     

       25
       20
        
         meta = with stdenv.lib; {

     

       26
       21
        
           description = "GNU ddrescue, a data recovery tool";

     

       27
       22

+1 -1

pkgs/tools/text/gnupatch/default.nix

···

       13
       13
        
       

     

       14
       14
        
         buildInputs = stdenv.lib.optional doCheck ed;

     

       15
       15
        
       

     

       16
       16
       -
         configureFlags = if hostPlatform == buildPlatform then null else [

     

       16
       16
       +
         configureFlags = stdenv.lib.optionals (hostPlatform != buildPlatform) [

     

       17
       17
        
           "ac_cv_func_strnlen_working=yes"

     

       18
       18
        
         ];

     

       19
       19