about summary refs log tree commit diff
diff options
context:
space:
mode:
authorWilliButz <WilliButz@users.noreply.github.com>2019-08-05 11:14:57 +0200
committerGitHub <noreply@github.com>2019-08-05 11:14:57 +0200
commitc4d3c5e3d59079c05ae38a59ba2d1240ab4f73a4 (patch)
tree9de11b6ef1e73d521db78550b88fe1fc19cf9ac7
parentc72fff2e030d843cd6d50a34ced4ec3c85d2cef3 (diff)
parentab9294b6ed6d4c346a0664e4a2d6ba804f3ec051 (diff)
downloadnixlib-c4d3c5e3d59079c05ae38a59ba2d1240ab4f73a4.tar
nixlib-c4d3c5e3d59079c05ae38a59ba2d1240ab4f73a4.tar.gz
nixlib-c4d3c5e3d59079c05ae38a59ba2d1240ab4f73a4.tar.bz2
nixlib-c4d3c5e3d59079c05ae38a59ba2d1240ab4f73a4.tar.lz
nixlib-c4d3c5e3d59079c05ae38a59ba2d1240ab4f73a4.tar.xz
nixlib-c4d3c5e3d59079c05ae38a59ba2d1240ab4f73a4.tar.zst
nixlib-c4d3c5e3d59079c05ae38a59ba2d1240ab4f73a4.zip
Merge pull request #65855 from jonringer/fix-disper
disper: 0.3.1 -> 0.3.1.1
-rw-r--r--pkgs/tools/misc/disper/default.nix21
1 files changed, 13 insertions, 8 deletions
diff --git a/pkgs/tools/misc/disper/default.nix b/pkgs/tools/misc/disper/default.nix
index 22951eecf533..167b4a547f82 100644
--- a/pkgs/tools/misc/disper/default.nix
+++ b/pkgs/tools/misc/disper/default.nix
@@ -1,9 +1,19 @@
-{stdenv, fetchurl, python, xorg, makeWrapper}:
+{ stdenv, fetchFromGitHub, python, xorg, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "disper-0.3.1";
+  pname = "disper";
+  version = "0.3.1.1";
 
-  buildInputs = [python makeWrapper];
+  src = fetchFromGitHub {
+    owner = "apeyser";
+    repo = pname;
+    rev = "${pname}-${version}";
+    sha256 = "1kl4py26n95q0690npy5mc95cv1cyfvh6kxn8rvk62gb8scwg9zn";
+  };
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  buildInputs = [ python ];
 
   preConfigure = ''
     export makeFlags="PREFIX=$out"
@@ -14,11 +24,6 @@ stdenv.mkDerivation rec {
         --prefix "LD_LIBRARY_PATH" : "${stdenv.lib.makeLibraryPath [ xorg.libXrandr xorg.libX11 ]}"
   '';
 
-  src = fetchurl {
-    url = http://ppa.launchpad.net/disper-dev/ppa/ubuntu/pool/main/d/disper/disper_0.3.1.tar.gz;
-    sha256 = "1l8brcpfn4iascb454ym0wrv5kqyz4f0h8k6db54nc3zhfwy7vvw";
-  };
-
   meta = {
     description = "On-the-fly display switch utility";
     homepage = http://willem.engen.nl/projects/disper/;