diff options
| author | Benjamin Staffin <benley@gmail.com> | 2018-09-18 17:49:11 -0400 |
|---|---|---|
| committer | Benjamin Staffin <benley@gmail.com> | 2018-09-18 17:49:52 -0400 |
| commit | 8b778c77982d20969c97e761f39e1345455b90f3 (patch) | |
| tree | 0a0228eab1b2beda44fdfd9f12bae9ede4cab315 /pkgs | |
| parent | 35378f014161c1d794dc89b6969275396cb601de (diff) | |
| download | nixpkgs-8b778c77982d20969c97e761f39e1345455b90f3.tar nixpkgs-8b778c77982d20969c97e761f39e1345455b90f3.tar.gz nixpkgs-8b778c77982d20969c97e761f39e1345455b90f3.tar.bz2 nixpkgs-8b778c77982d20969c97e761f39e1345455b90f3.tar.lz nixpkgs-8b778c77982d20969c97e761f39e1345455b90f3.tar.xz nixpkgs-8b778c77982d20969c97e761f39e1345455b90f3.tar.zst nixpkgs-8b778c77982d20969c97e761f39e1345455b90f3.zip | |
ddccontrol: 0.4.2 -> 0.4.4
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/tools/misc/ddccontrol/automake.patch | 14 | ||||
| -rw-r--r-- | pkgs/tools/misc/ddccontrol/default.nix | 38 |
2 files changed, 20 insertions, 32 deletions
diff --git a/pkgs/tools/misc/ddccontrol/automake.patch b/pkgs/tools/misc/ddccontrol/automake.patch deleted file mode 100644 index a890654ca7c..00000000000 --- a/pkgs/tools/misc/ddccontrol/automake.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/src/gnome-ddcc-applet/Makefile.am b/src/gnome-ddcc-applet/Makefile.am -index d85ff56..b13e74c 100644 ---- a/src/gnome-ddcc-applet/Makefile.am -+++ b/src/gnome-ddcc-applet/Makefile.am -@@ -6,7 +6,8 @@ DDCC_LDADD = ../lib/libddccontrol.la - - EXTRA_DIST = GNOME_ddcc-applet.server.in.in GNOME_ddcc-applet.xml - --pkglib_PROGRAMS = ddcc-applet -+programfilesdir = $(pkglibdir) -+programfiles_PROGRAMS = ddcc-applet - ddcc_applet_SOURCES = ddcc-applet.c ddcc-applet.h - - ddcc_applet_LDADD = $(GNOME_LDFLAGS) $(DDCC_LDADD) diff --git a/pkgs/tools/misc/ddccontrol/default.nix b/pkgs/tools/misc/ddccontrol/default.nix index b03a286d202..8453aa67747 100644 --- a/pkgs/tools/misc/ddccontrol/default.nix +++ b/pkgs/tools/misc/ddccontrol/default.nix @@ -1,36 +1,39 @@ -{ stdenv, fetchurl, autoreconfHook, intltool, perl, perlPackages, libxml2 +{ stdenv, fetchFromGitHub, autoreconfHook, intltool, libxml2 , pciutils, pkgconfig, gtk2, ddccontrol-db , makeDesktopItem }: -let version = "0.4.2"; in +let version = "0.4.4"; in stdenv.mkDerivation rec { name = "ddccontrol-${version}"; - src = fetchurl { - url = "mirror://sourceforge/ddccontrol/ddccontrol-${version}.tar.bz2"; - sha1 = "fd5c53286315a61a18697a950e63ed0c8d5acff1"; + src = fetchFromGitHub { + owner = "ddccontrol"; + repo = "ddccontrol"; + rev = "0.4.4"; + sha256 = "09npy6z2j3jrvpvlr46vih31y2mbrh7wsqlbrjprxjv1j0kkz5q2"; }; nativeBuildInputs = [ autoreconfHook intltool pkgconfig ]; buildInputs = [ - perl perlPackages.libxml_perl libxml2 pciutils gtk2 ddccontrol-db + libxml2 + pciutils + gtk2 + ddccontrol-db ]; - patches = [ ./automake.patch ]; - hardeningDisable = [ "format" "bindnow" ]; prePatch = '' - newPath=$(echo "${ddccontrol-db}/share/ddccontrol-db" | sed "s/\\//\\\\\\//g") - mv configure.ac configure.ac.old - oldPath="\$" - oldPath+="{datadir}\/ddccontrol-db" - sed "s/$oldPath/$newPath/" <configure.ac.old >configure.ac - rm configure.ac.old - - sed -e "s/chmod 4711/chmod 0711/" -i src/ddcpci/Makefile* + oldPath="\$""{datadir}/ddccontrol-db" + newPath="${ddccontrol-db}/share/ddccontrol-db" + sed -i -e "s|$oldPath|$newPath|" configure.ac + sed -i -e "s/chmod 4711/chmod 0711/" src/ddcpci/Makefile* + ''; + + preConfigure = '' + intltoolize --force ''; postInstall = '' @@ -53,10 +56,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A program used to control monitor parameters by software"; - homepage = http://ddccontrol.sourceforge.net/; + homepage = https://github.com/ddccontrol/ddccontrol; license = licenses.gpl2; platforms = [ "i686-linux" "x86_64-linux" ]; maintainers = [ stdenv.lib.maintainers.pakhfn ]; }; } - |