public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #116564 from samuelgrf/fix-allowAliases-false

Browse Source
This commit is contained in:
Sandro
2021-03-17 09:40:53 +01:00
committed by GitHub
parent eba8103149 a5ea64eaca
commit 8bd2cea10b
47 changed files with 94 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/graphics/nip2/default.nix
+3 -3
View File
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, pkg-config, glib, libxml2, flex, bison, vips, gnome2,
fftw, gsl, goffice, libgsf }:
{ lib, stdenv, fetchurl, pkg-config, glib, libxml2, flex, bison, vips, gtk2
, fftw, gsl, goffice, libgsf }:
stdenv.mkDerivation rec {
pname = "nip2";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
buildInputs =
[ pkg-config glib libxml2 flex bison vips
gnome2.gtk fftw gsl goffice libgsf
gtk2 fftw gsl goffice libgsf
];
meta = with lib; {
pkgs/tools/misc/shelldap/default.nix
+1 -1
View File
@@ -6,7 +6,7 @@ perlPackages.buildPerlPackage rec {
url = "https://bitbucket.org/mahlon/shelldap/downloads/shelldap-${version}.tar.gz";
sha256 = "07gkvvxcgw3pgkfy8p9mmidakciaq1rsq5zhmdqd8zcwgqkrr24i";
};
buildInputs = with perlPackages; [ perl YAMLSyck NetLDAP AlgorithmDiff IOSocketSSL AuthenSASL TermReadLineGnu TermShell ];
buildInputs = with perlPackages; [ perl YAMLSyck perlldap AlgorithmDiff IOSocketSSL AuthenSASL TermReadLineGnu TermShell ];
prePatch = ''
touch Makefile.PL
'';
pkgs/tools/security/gencfsm/default.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, autoconf, automake, intltool, libtool, pkg-config, encfs
, glib , gnome3, gtk3, libgnome-keyring, vala, wrapGAppsHook, xorg, gobject-introspection
, glib , libgee, gtk3, libgnome-keyring, vala, wrapGAppsHook, xorg, gobject-introspection
}:
stdenv.mkDerivation rec {
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config ];
buildInputs = [ autoconf automake intltool libtool vala glib encfs
gtk3 libgnome-keyring gnome3.libgee xorg.libSM xorg.libICE
gtk3 libgnome-keyring libgee xorg.libSM xorg.libICE
wrapGAppsHook gobject-introspection ];
patches = [ ./makefile-mkdir.patch ];