Commit 06810517 authored by Ashish SHUKLA's avatar Ashish SHUKLA Committed by Alyssa Ross
Browse files

dino: 0.4.3 -> 0.4.4 

- remove patches
- switch to finalAttrs
parent 8471cfbf

pkgs/applications/networking/instant-messengers/dino/default.nix

+6 −12
Original line number Diff line number Diff line
@@ -23,23 +23,17 @@ 
, webrtc-audio-processing

}:



stdenv.mkDerivation rec {

stdenv.mkDerivation (finalAttrs: {

  pname = "dino";

  version = "0.4.3";

  version = "0.4.4";



  src = fetchFromGitHub {

    owner = "dino";

    repo = "dino";

    rev = "v${version}";

    sha256 = "sha256-smy/t6wTCnG0kuRFKwyeLENKqOQDhL0fZTtj3BHo6kw=";

    rev = "v${finalAttrs.version}";

    sha256 = "sha256-I0ASeEjdXyxhz52QisU0q8mIBTKMfjaspJbxRIyOhD4=";

  };



  patches = [

    # fixes build failure https://github.com/dino/dino/issues/1576

    # backport of https://github.com/dino/dino/commit/657502955567dd538e56f300e075c7db52e25d74

    ./fix-compile-new-vala-c.diff

  ];



  postPatch = ''

    # don't overwrite manually set version information

    substituteInPlace CMakeLists.txt \
@@ -92,7 +86,7 @@ stdenv.mkDerivation rec { 
    "-DRTP_ENABLE_VP9=true"

    "-DVERSION_FOUND=true"

    "-DVERSION_IS_RELEASE=true"

    "-DVERSION_FULL=${version}"

    "-DVERSION_FULL=${finalAttrs.version}"

    "-DXGETTEXT_EXECUTABLE=${lib.getBin buildPackages.gettext}/bin/xgettext"

    "-DMSGFMT_EXECUTABLE=${lib.getBin buildPackages.gettext}/bin/msgfmt"

    "-DGLIB_COMPILE_RESOURCES_EXECUTABLE=${lib.getDev buildPackages.glib}/bin/glib-compile-resources"
@@ -133,4 +127,4 @@ stdenv.mkDerivation rec { 
    platforms = platforms.linux ++ platforms.darwin;

    maintainers = with maintainers; [ qyliss tomfitzhenry ];

  };

}
 
})