Commit 31b198ad authored by Otavio Salvador's avatar Otavio Salvador
Browse files

dtc: fix linker options so it also works in Darwin 



We dropped two simple patches which were changing the version in
meson.build as the "dtc: Fix linker options so it also works in Darwin"
is bigger.

Signed-off-by: default avatarOtavio Salvador <otavio@ossystems.com.br>
parent 70c4a233

pkgs/development/compilers/dtc/default.nix

+12 −12
Original line number Diff line number Diff line
@@ -31,23 +31,17 @@ stdenv.mkDerivation rec { 
      sha256 = "sha256-C7OzwY0zq+2CV3SB5unI7Ill2M3deF7FXeQE3B/Kx2s=";

    })



    # meson.build: bump version to 1.7.0

    (fetchpatch {

      url = "https://github.com/dgibson/dtc/commit/64a907f08b9bedd89833c1eee674148cff2343c6.patch";

      sha256 = "sha256-p2KGS5GW+3uIPgXfuIx6aDC54csM+5FZDkK03t58AL8=";

    })



    # Fix version in libfdt/meson.build

    (fetchpatch {

      url = "https://github.com/dgibson/dtc/commit/723545ebe9933b90ea58dc125e4987c6bcb04ade.patch";

      sha256 = "sha256-5Oq7q+62ZObj3e7rguN9jhSpYoQkwjSfo/N893229dQ=";

    })



    # Use #ifdef NO_VALGRIND

    (fetchpatch {

      url = "https://github.com/dgibson/dtc/commit/41821821101ad8a9f83746b96b163e5bcbdbe804.patch";

      sha256 = "sha256-7QEFDtap2DWbUGqtyT/RgJZJFldKB8oSubKiCtLZ0w4=";

    })



    # dtc: Fix linker options so it also works in Darwin

    (fetchpatch {

      url = "https://github.com/dgibson/dtc/commit/3acde70714df3623e112cf3ec99fc9b5524220b8.patch";

      sha256 = "sha256-uLXL0Sjcn+bnMuF+A6PjUW1Rq6uNg1dQl58zbeYpP/U=";

    })

  ];



  env.SETUPTOOLS_SCM_PRETEND_VERSION = version;
@@ -69,6 +63,12 @@ stdenv.mkDerivation rec { 


  postPatch = ''

    patchShebangs setup.py



    # meson.build: bump version to 1.7.0

    substituteInPlace libfdt/meson.build \

      --replace "version: '1.6.0'," "version: '${version}',"

    substituteInPlace meson.build \

      --replace "version: '1.6.0'," "version: '${version}',"

  '';



  # Required for installation of Python library and is innocuous otherwise.