From 9fded55a9cbcb7ba17ff45e65ec17f1bddd03df5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 10 Apr 2019 01:02:24 -0300 Subject: [PATCH 1/2] deepin.udisks2-qt5: init at 0.0.1 --- pkgs/desktops/deepin/default.nix | 1 + pkgs/desktops/deepin/udisks2-qt5/default.nix | 37 ++++++++++++++++++++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/desktops/deepin/udisks2-qt5/default.nix diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix index 019571498ea80..b0d334ff3b49b 100644 --- a/pkgs/desktops/deepin/default.nix +++ b/pkgs/desktops/deepin/default.nix @@ -49,6 +49,7 @@ let qcef = callPackage ./qcef { }; qt5dxcb-plugin = callPackage ./qt5dxcb-plugin { }; qt5integration = callPackage ./qt5integration { }; + udisks2-qt5 = callPackage ./udisks2-qt5 { }; }; diff --git a/pkgs/desktops/deepin/udisks2-qt5/default.nix b/pkgs/desktops/deepin/udisks2-qt5/default.nix new file mode 100644 index 0000000000000..49874b1a48e22 --- /dev/null +++ b/pkgs/desktops/deepin/udisks2-qt5/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchFromGitHub, qmake, deepin }: + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "udisks2-qt5"; + version = "0.0.1"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "1gk4jmq7mrzk181r6man2rz1iyzkfasz7053a30h4nn24mq8ikig"; + }; + + nativeBuildInputs = [ + qmake + deepin.setupHook + ]; + + postPatch = '' + searchHardCodedPaths + ''; + + postFixup = '' + searchHardCodedPaths $out + ''; + + passthru.updateScript = deepin.updateScript { inherit name; }; + + meta = with stdenv.lib; { + description = "UDisks2 D-Bus interfaces binding for Qt5"; + homepage = https://github.com/linuxdeepin/udisks2-qt5; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ romildo ]; + }; +} From 5c0495f2010de04148777a176d298b32222f82b2 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Wed, 10 Apr 2019 00:18:55 -0400 Subject: [PATCH 2/2] fixup! deepin.udisks2-qt5: init at 0.0.1 --- pkgs/desktops/deepin/udisks2-qt5/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/deepin/udisks2-qt5/default.nix b/pkgs/desktops/deepin/udisks2-qt5/default.nix index 49874b1a48e22..f4dae7790618f 100644 --- a/pkgs/desktops/deepin/udisks2-qt5/default.nix +++ b/pkgs/desktops/deepin/udisks2-qt5/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, qmake, deepin }: +{ stdenv, fetchFromGitHub, qmake, qtbase, pkgconfig, deepin }: stdenv.mkDerivation rec { name = "${pname}-${version}"; @@ -13,8 +13,12 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - qmake deepin.setupHook + qmake + ]; + + buildInputs = [ + qtbase ]; postPatch = ''