From c9ead485a87d5d23fdddb1f07e75f5c3c3d208b3 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Sat, 14 Nov 2015 17:24:45 +0100 Subject: [PATCH 1/2] Revert "miraclecast: init at 0.0-git-20151002" This completes the revert of commit 9e33e2365eeff59e9a25701dc2cf8dbcc38a9dc8. which was started in 741bf840dad05cd1728481045466811ae8ae8281 --- pkgs/top-level/all-packages.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1b9480a26491..45025d4b3b99 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10168,10 +10168,6 @@ let mingetty = callPackage ../os-specific/linux/mingetty { }; - miraclecast = callPackage ../os-specific/linux/miraclecast { - systemd = systemd.override { enableKDbus = true; }; - }; - mkinitcpio-nfs-utils = callPackage ../os-specific/linux/mkinitcpio-nfs-utils { }; module_init_tools = callPackage ../os-specific/linux/module-init-tools { }; From d7f9b6d8ca5869cb2716e98e6bd6ff76e9fe96a6 Mon Sep 17 00:00:00 2001 From: Thomas Strobel Date: Fri, 2 Oct 2015 12:09:30 +0200 Subject: [PATCH 2/2] miraclecast: init at 0.0-git-20151002 --- .../os-specific/linux/miraclecast/default.nix | 26 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/os-specific/linux/miraclecast/default.nix diff --git a/pkgs/os-specific/linux/miraclecast/default.nix b/pkgs/os-specific/linux/miraclecast/default.nix new file mode 100644 index 000000000000..3d5a76144af5 --- /dev/null +++ b/pkgs/os-specific/linux/miraclecast/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, udev, systemd, glib, readline }: + +with stdenv.lib; +stdenv.mkDerivation rec { + name = "miraclecast-0.0-git-20151002"; + + src = fetchFromGitHub { + owner = "albfan"; + repo = "miraclecast"; + rev = "30b8c2d22391423f76ba582aaaa1e0936869103a"; + sha256 = "0i076n76kq64fayc7v06gr1853pk5r6ms86m57vd1xsjd0r9wyxd"; + }; + + # INFO: It is important to list 'systemd' first as for now miraclecast + # links against a customized systemd. Otherwise, a systemd package from + # a propagatedBuildInput could take precedence. + buildInputs = [ systemd autoreconfHook pkgconfig udev glib readline ]; + + meta = { + homepage = https://github.com/albfan/miraclecast; + description = "Connect external monitors via Wi-Fi"; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ tstrobel ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 45025d4b3b99..1b9480a26491 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10168,6 +10168,10 @@ let mingetty = callPackage ../os-specific/linux/mingetty { }; + miraclecast = callPackage ../os-specific/linux/miraclecast { + systemd = systemd.override { enableKDbus = true; }; + }; + mkinitcpio-nfs-utils = callPackage ../os-specific/linux/mkinitcpio-nfs-utils { }; module_init_tools = callPackage ../os-specific/linux/module-init-tools { };