mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-01-18 02:44:30 +00:00
Artturi
GitHub
commit
91f186baa6
@ -13,7 +13,7 @@
|
||||
, libXrandr
|
||||
, libXi
|
||||
, gnome
|
||||
, kdialog
|
||||
, libsForQt5
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
@ -71,7 +71,7 @@ rustPlatform.buildRustPackage rec {
|
||||
in
|
||||
''
|
||||
patchelf --set-rpath "${libPath}" "$out/bin/$pname"
|
||||
wrapProgram $out/bin/$pname --prefix PATH : ${lib.makeBinPath [ gnome.zenity kdialog ]}
|
||||
wrapProgram $out/bin/$pname --prefix PATH : ${lib.makeBinPath [ gnome.zenity libsForQt5.kdialog ]}
|
||||
'';
|
||||
|
||||
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
, pkg-config, autoreconfHook
|
||||
, db5, openssl, boost, zlib, miniupnpc, libevent
|
||||
, protobuf, qtbase ? null
|
||||
, wrapQtAppsHook ? null, qttools, qmake ? null, qrencode
|
||||
, wrapQtAppsHook ? null, qttools ? null, qmake ? null, qrencode
|
||||
, withGui, withUpnp ? true, withUtils ? true, withWallet ? true
|
||||
, withZmq ? true, zeromq, util-linux ? null, Cocoa ? null }:
|
||||
|
||||
|
||||
@ -1,29 +0,0 @@
|
||||
{ lib, stdenv, fetchurl, pkg-config, fltk, openexr, libGLU, libGL, ctl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "openexr_viewers";
|
||||
version = "2.2.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://savannah/openexr/openexr_viewers-${version}.tar.gz";
|
||||
sha256 = "1ixx2wbjp4rvsf7h3bkja010gl1ihjrcjzy7h20jnn47ikg12vj8";
|
||||
};
|
||||
|
||||
configurePhase = ''
|
||||
./configure --prefix=$out --with-fltk-config=${fltk}/bin/fltk-config
|
||||
'';
|
||||
|
||||
buildPhase = ''
|
||||
make LDFLAGS="`fltk-config --ldflags` -lGL -lfltk_gl"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ openexr fltk libGLU libGL ctl ];
|
||||
|
||||
meta = {
|
||||
description = "Application for viewing OpenEXR images on a display at various exposure settings";
|
||||
homepage = "http://openexr.com";
|
||||
platforms = lib.platforms.linux;
|
||||
license = lib.licenses.bsd3;
|
||||
};
|
||||
}
|
||||
@ -1,76 +0,0 @@
|
||||
{ lib, stdenv, fetchFromGitHub, cmake, qt4, quazip, qt-mobility, qxt, python2Packages }:
|
||||
|
||||
with lib;
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "screencloud";
|
||||
version = "1.2.0";
|
||||
|
||||
# API Keys. According to the author of the AUR package, these are only used
|
||||
# for tracking usage.
|
||||
consumerKey = "23e747012c68601f27ab69c6de129ed70552d55b6";
|
||||
consumerSecret = "4701cb00c1bd357bbcae7c3d713dd216";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "olav-st";
|
||||
repo = "screencloud";
|
||||
rev = "v${version}";
|
||||
sha256 = "1s0dxa1sa37nvna5nfqdsp294810favj68qb7ghl78qna7zw0cim";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [ qt4 quazip qt-mobility qxt python2Packages.python python2Packages.pycrypto ];
|
||||
|
||||
patchPhase = ''
|
||||
# Required to make the configure script work. Normally, screencloud's
|
||||
# CMakeLists file sets the install prefix to /opt by force. This is stupid
|
||||
# and breaks nix, so we force it to install where we want. Please don't
|
||||
# write CMakeLists files like this, as things like this are why we can't
|
||||
# have nice things.
|
||||
substituteInPlace "CMakeLists.txt" --replace "set(CMAKE_INSTALL_PREFIX \"/opt\")" ""
|
||||
'';
|
||||
|
||||
# We need to append /opt to our CMAKE_INSTALL_PREFIX, so we tell the Nix not
|
||||
# to add the argument for us.
|
||||
dontAddPrefix = true;
|
||||
|
||||
cmakeFlags = [
|
||||
"-DQXT_QXTCORE_INCLUDE_DIR=${qxt}/include/QxtCore"
|
||||
"-DQXT_QXTCORE_LIB_RELEASE=${qxt}/lib/libQxtCore.so"
|
||||
"-DQXT_QXTGUI_INCLUDE_DIR=${qxt}/include/QxtGui"
|
||||
"-DQXT_QXTGUI_LIB_RELEASE=${qxt}/lib/libQxtGui.so"
|
||||
"-DCONSUMER_KEY_SCREENCLOUD=${consumerKey}"
|
||||
"-DCONSUMER_SECRET_SCREENCLOUD=${consumerSecret}"
|
||||
];
|
||||
|
||||
setSourceRoot = ''
|
||||
sourceRoot=$(echo */screencloud)
|
||||
'';
|
||||
|
||||
preConfigure = ''
|
||||
# This needs to be set in preConfigure instead of cmakeFlags in order to
|
||||
# access the $prefix environment variable.
|
||||
export cmakeFlags="-DCMAKE_INSTALL_PREFIX=$prefix/opt $cmakeFlags"
|
||||
'';
|
||||
|
||||
# There are a number of issues with screencloud's installation. We need to add
|
||||
# pycrypto to the PYTHONPATH so that the SFTP plugin will work properly; and
|
||||
# we need to move the libPythonQt library into a folder where it can actually
|
||||
# be found.
|
||||
postInstall = ''
|
||||
patchShebangs $prefix/opt/screencloud/screencloud.sh
|
||||
substituteInPlace "$prefix/opt/screencloud/screencloud.sh" --replace "/opt" "$prefix/opt"
|
||||
sed -i "2 i\export PYTHONPATH=$(toPythonPath ${python2Packages.pycrypto}):\$PYTHONPATH" "$prefix/opt/screencloud/screencloud.sh"
|
||||
mkdir $prefix/bin
|
||||
mkdir $prefix/lib
|
||||
ln -s $prefix/opt/screencloud/screencloud.sh $prefix/bin/screencloud
|
||||
ln -s $prefix/opt/screencloud/libPythonQt.so $prefix/lib/libPythonQt.so
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "https://screencloud.net/";
|
||||
description = "Client for Screencloud, an easy to use screenshot sharing tool";
|
||||
license = lib.licenses.gpl2;
|
||||
maintainers = with lib.maintainers; [ forkk ];
|
||||
platforms = with lib.platforms; linux;
|
||||
};
|
||||
}
|
||||
@ -1,8 +1,8 @@
|
||||
{ invalidateFetcherByDrvHash, fetchurl, jq, moreutils, ... }: {
|
||||
{ testers, fetchurl, jq, moreutils, ... }: {
|
||||
# Tests that we can send custom headers with spaces in them
|
||||
header =
|
||||
let headerValue = "Test '\" <- These are some quotes";
|
||||
in invalidateFetcherByDrvHash fetchurl {
|
||||
in testers.invalidateFetcherByDrvHash fetchurl {
|
||||
url = "https://httpbin.org/headers";
|
||||
sha256 = builtins.hashString "sha256" (headerValue + "\n");
|
||||
curlOptsList = [ "-H" "Hello: ${headerValue}" ];
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
, stdenvNoCC
|
||||
, fetchFromGitHub
|
||||
, adwaita-icon-theme
|
||||
, breeze-icons
|
||||
, libsForQt5
|
||||
, gtk3
|
||||
, hicolor-icon-theme
|
||||
, jdupes
|
||||
@ -35,7 +35,7 @@ stdenvNoCC.mkDerivation rec {
|
||||
|
||||
propagatedBuildInputs = [
|
||||
adwaita-icon-theme
|
||||
breeze-icons
|
||||
libsForQt5.breeze-icons
|
||||
hicolor-icon-theme
|
||||
];
|
||||
|
||||
|
||||
@ -1,32 +0,0 @@
|
||||
{lib, stdenv, fetchurl, openssl, fuse}:
|
||||
|
||||
throw "It still does not build"
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fsfs";
|
||||
version = "0.1.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/fsfs/fsfs-${version}.tar.gz";
|
||||
sha256 = "05wka9aq182li2r7gxcd8bb3rhpns7ads0k59v7w1jza60l57c74";
|
||||
};
|
||||
|
||||
buildInputs = [ fuse openssl ];
|
||||
|
||||
patchPhase = ''
|
||||
sed -i -e 's,CONFDIR=\(.*\),CONFDIR='$out/etc, \
|
||||
-e 's,USERCONFPREFIX=\(.*\),USERCONFPREFIX='$out/var/lib, Makefile \
|
||||
src/Makefile src/utils/Makefile
|
||||
'';
|
||||
|
||||
preInstall = ''
|
||||
mkdir -p $out/etc $out/var/lib
|
||||
makeFlags="$makeFlags prefix=$out"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "http://fsfs.sourceforge.net/";
|
||||
description = "Secure distributed file system in user space";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
};
|
||||
}
|
||||
@ -1,52 +0,0 @@
|
||||
{ lib, stdenv, fetchFromGitHub
|
||||
, cmake, pkg-config, arpa2cm
|
||||
, openldap, p11-kit, unbound, libtasn1, db, openssl, quickder, libkrb5, ldns, gnutls-kdh
|
||||
, softhsm
|
||||
}:
|
||||
|
||||
let
|
||||
pname = "tlspool";
|
||||
version = "20180227";
|
||||
in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "${pname}-${version}";
|
||||
src = fetchFromGitHub {
|
||||
owner = "arpa2";
|
||||
repo = "tlspool";
|
||||
rev = "b4459637d71c7602e94d455e23c74f3973b9cf30";
|
||||
sha256 = "0x78f2bdsiglwicwn3injm5ysfjlfa0yzdpnc0r3iw4z0n89rj2r";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake pkg-config arpa2cm
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
openldap p11-kit unbound libtasn1 db openssl quickder libkrb5 ldns gnutls-kdh
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# CMake is probably confused because the current version isn't 1.2.6, but 1.2-6
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace "Quick-DER 1.2.4" "Quick-DER 1.2"
|
||||
substituteInPlace etc/tlspool.conf \
|
||||
--replace "dnssec_rootkey ../etc/root.key" "dnssec_rootkey $out/etc/root.key" \
|
||||
--replace "pkcs11_path /usr/local/lib/softhsm/libsofthsm2.so" "pkcs11_path ${softhsm}/lib/softhsm/libsofthsm2.so"
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out/include/${pname}/pulleyback $out/etc/tlspool
|
||||
cp -R $src/etc/* $out/etc/tlspool/
|
||||
cp $src/include/tlspool/*.h $out/include/${pname}
|
||||
cp $src/pulleyback/*.h $out/include/${pname}/pulleyback/
|
||||
cp $src/src/*.h $out/include/${pname}
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A supercharged TLS daemon that allows for easy, strong and consistent deployment";
|
||||
license = licenses.gpl3;
|
||||
homepage = "http://www.tlspool.org";
|
||||
maintainers = with maintainers; [ leenaars qknight ];
|
||||
};
|
||||
}
|
||||
@ -1,19 +1,16 @@
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, buildPythonApplication
|
||||
, pexpect
|
||||
, pyyaml
|
||||
, python3
|
||||
, openssh
|
||||
, nixosTests
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonApplication rec{
|
||||
python3.pkgs.buildPythonApplication rec{
|
||||
pname = "xxh";
|
||||
version = "0.8.12";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
disabled = python3.pkgs.pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
@ -23,8 +20,8 @@ buildPythonApplication rec{
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
pexpect
|
||||
pyyaml
|
||||
python3.pkgs.pexpect
|
||||
python3.pkgs.pyyaml
|
||||
openssh
|
||||
];
|
||||
|
||||
|
||||
@ -1618,9 +1618,7 @@ with pkgs;
|
||||
|
||||
libmirage = callPackage ../applications/emulators/cdemu/libmirage.nix { };
|
||||
|
||||
ludusavi = callPackage ../applications/backup/ludusavi {
|
||||
inherit (plasma5Packages) kdialog;
|
||||
};
|
||||
ludusavi = callPackage ../applications/backup/ludusavi { };
|
||||
|
||||
maiko = callPackage ../applications/emulators/maiko { };
|
||||
|
||||
@ -6851,8 +6849,6 @@ with pkgs;
|
||||
|
||||
fsarchiver = callPackage ../tools/archivers/fsarchiver { };
|
||||
|
||||
fsfs = callPackage ../tools/filesystems/fsfs { };
|
||||
|
||||
fstl = qt5.callPackage ../applications/graphics/fstl { };
|
||||
|
||||
fswebcam = callPackage ../os-specific/linux/fswebcam { };
|
||||
@ -11262,8 +11258,6 @@ with pkgs;
|
||||
|
||||
screen-message = callPackage ../tools/X11/screen-message { };
|
||||
|
||||
screencloud = libsForQt5.callPackage ../applications/graphics/screencloud { };
|
||||
|
||||
screenkey = callPackage ../applications/video/screenkey { };
|
||||
|
||||
scrub = callPackage ../tools/misc/scrub { };
|
||||
@ -12090,8 +12084,6 @@ with pkgs;
|
||||
|
||||
tldr-hs = haskellPackages.tldr;
|
||||
|
||||
tlspool = callPackage ../tools/networking/tlspool { };
|
||||
|
||||
tlsx = callPackage ../tools/security/tlsx { };
|
||||
|
||||
tmate = callPackage ../tools/misc/tmate { };
|
||||
@ -27060,7 +27052,6 @@ with pkgs;
|
||||
|
||||
tela-circle-icon-theme = callPackage ../data/icons/tela-circle-icon-theme {
|
||||
inherit (gnome) adwaita-icon-theme;
|
||||
inherit (plasma5Packages) breeze-icons;
|
||||
};
|
||||
|
||||
tela-icon-theme = callPackage ../data/icons/tela-icon-theme { };
|
||||
@ -28376,8 +28367,6 @@ with pkgs;
|
||||
|
||||
kvmtool = callPackage ../applications/virtualization/kvmtool { };
|
||||
|
||||
exrdisplay = callPackage ../applications/graphics/exrdisplay { };
|
||||
|
||||
exrtools = callPackage ../applications/graphics/exrtools { };
|
||||
|
||||
f1viewer = callPackage ../applications/video/f1viewer {};
|
||||
@ -33160,7 +33149,7 @@ with pkgs;
|
||||
gtk = gtk2;
|
||||
};
|
||||
|
||||
xxh = with python3Packages; toPythonApplication xxh;
|
||||
xxh = callPackage ../tools/networking/xxh { };
|
||||
|
||||
kodiPackages = recurseIntoAttrs (kodi.packages);
|
||||
|
||||
|
||||
@ -12149,8 +12149,6 @@ self: super: with self; {
|
||||
inherit (pkgs.xorg) xorgserver;
|
||||
};
|
||||
|
||||
xxh = callPackage ../tools/networking/xxh { };
|
||||
|
||||
xxhash = callPackage ../development/python-modules/xxhash { };
|
||||
|
||||
yabadaba = callPackage ../development/python-modules/yabadaba { };
|
||||
|
||||
Loading…
Reference in New Issue
Block a user