From 13f40aea332f84bb82f1aed9a7ba62423d439b93 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Fri, 4 Apr 2014 16:14:38 +0200 Subject: [PATCH] libpwquality: factor out from gnome-control-center --- .../core/gnome-control-center/default.nix | 23 +++++-------------- .../libraries/libpwquality/default.nix | 12 ++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 20 insertions(+), 17 deletions(-) create mode 100644 pkgs/development/libraries/libpwquality/default.nix diff --git a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix index ed9adb370d44..6b8f427d4107 100644 --- a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix @@ -1,24 +1,13 @@ -{ fetchurl, stdenv, pkgconfig, gnome3, ibus, intltool, upower, libcanberra, accountservice -, libxml2, polkit, libxslt, libgtop, libsoup, colord, colord-gtk, pulseaudio, fontconfig -, cracklib, python, krb5, networkmanagerapplet, libwacom, samba, libnotify, libxkbfile -, shared_mime_info, tzdata, icu, libtool, docbook_xsl, docbook_xsl_ns, makeWrapper }: +{ fetchurl, stdenv, pkgconfig, gnome3, ibus, intltool, upower, makeWrapper +, libcanberra, accountservice, libpwquality, pulseaudio, fontconfig +, libxml2, polkit, libxslt, libgtop, libsoup, colord, colord-gtk, libxkbfile +, cracklib, python, krb5, networkmanagerapplet, libwacom, samba, libnotify +, shared_mime_info, tzdata, icu, libtool, docbook_xsl, docbook_xsl_ns }: # http://ftp.gnome.org/pub/GNOME/teams/releng/3.10.2/gnome-suites-core-3.10.2.modules # TODO: bluetooth, networkmanager, wacom, smbclient, printers -let - libpwquality = stdenv.mkDerivation rec { - name = "libpwquality-1.2.3"; - - src = fetchurl { - url = "https://fedorahosted.org/releases/l/i/libpwquality/${name}.tar.bz2"; - sha256 = "0sjiabvl5277nfxyy96jdz65a0a3pmkkwrfbziwgik83gg77j75i"; - }; - - buildInputs = [ cracklib python ]; - }; - -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { name = "gnome-control-center-3.10.2"; src = fetchurl { diff --git a/pkgs/development/libraries/libpwquality/default.nix b/pkgs/development/libraries/libpwquality/default.nix new file mode 100644 index 000000000000..aaa39783fa72 --- /dev/null +++ b/pkgs/development/libraries/libpwquality/default.nix @@ -0,0 +1,12 @@ +{ stdenv, cracklib, fetchurl, python }: + +stdenv.mkDerivation rec { + name = "libpwquality-1.2.3"; + + src = fetchurl { + url = "https://fedorahosted.org/releases/l/i/libpwquality/${name}.tar.bz2"; + sha256 = "0sjiabvl5277nfxyy96jdz65a0a3pmkkwrfbziwgik83gg77j75i"; + }; + + buildInputs = [ cracklib python ]; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5c43aa90d2cc..1daa2eba8a5b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5112,6 +5112,8 @@ let libpseudo = callPackage ../development/libraries/libpseudo { }; + libpwquality = callPackage ../development/libraries/libpwquality { }; + libqalculate = callPackage ../development/libraries/libqalculate { }; librsvg = callPackage ../development/libraries/librsvg {